The computer’s hard disk must have a BIOS that is compatible with TPM and that supports USB devices during computer startup. |
Note
diff --git a/mdop/mbam-v25/release-notes-for-mbam-25-sp1.md b/mdop/mbam-v25/release-notes-for-mbam-25-sp1.md
index b52e59331b..a0c7a80e05 100644
--- a/mdop/mbam-v25/release-notes-for-mbam-25-sp1.md
+++ b/mdop/mbam-v25/release-notes-for-mbam-25-sp1.md
@@ -119,13 +119,7 @@ If Internet Explorer Enhanced Security Configuration (ESC) is turned on, an "Acc
**Workaround:** If the "Access Denied" error message appears when you try to view reports on the MBAM Server, you can set a Group Policy Object or change the default manually in your image to disable Enhanced Security Configuration. You can also alternatively view the reports from another computer on which ESC is not enabled.
### Support for Bitlocker XTS-AES encryption algorithm
-Bitlocker added support for the XTS-AES encryption algorithm in Windows 10, version 1511.
-As of HF02, MBAM now supports this Bitlocker option and is a client-only update.
-However, there are two known limitations:
-
-* MBAM will correctly report compliance status but the **Cipher Strength** field in MBAM reports will be empty.
-MBAM pre-built reports and compliance charts won’t break but the **Cipher Strength** column will be empty for XTS machines.
-Also, if a customer has a custom report that uses this particular field, they may have to make adjustments to accommodate this update.
+Bitlocker added support for the XTS-AES encryption algorithm in Windows 10, version 1511. With HF02, MBAM added client support for this Bitlocker option and in HF04, the server-side support was added. However, there is one known limitation:
* Customers must use the same encryption strength for OS and data volumes on the same machine.
If different encryption strengths are used, MBAM will report the machine as **non-compliant**.
diff --git a/smb/breadcrumb/toc.yml b/smb/breadcrumb/toc.yml
new file mode 100644
index 0000000000..08883fd504
--- /dev/null
+++ b/smb/breadcrumb/toc.yml
@@ -0,0 +1,11 @@
+- name: Docs
+ tocHref: /
+ topicHref: /
+ items:
+ - name: Windows
+ tocHref: /windows
+ topicHref: https://docs.microsoft.com/en-us/windows/#pivot=it-pro
+ items:
+ - name: SMB
+ tocHref: /windows/smb
+ topicHref: /windows/smb/index
\ No newline at end of file
diff --git a/smb/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md
index 5c56cb0492..ea6e3ecf3a 100644
--- a/smb/cloud-mode-business-setup.md
+++ b/smb/cloud-mode-business-setup.md
@@ -12,13 +12,13 @@ ms.pagetype: smb
author: CelesteDG
---
-
-
# Get started: Deploy and manage a full cloud IT solution for your business
**Applies to:**
- Office 365 Business Premium, Azure AD Premium, Intune, Windows Store for Business, Windows 10
+Are you ready to move your business to the cloud or wondering what it takes to make this happen with Microsoft cloud services and tools?
+
In this walkthrough, we'll show you how to deploy and manage a full cloud IT solution for your small to medium business using Office 365 Business Premium, Microsoft Azure AD, Intune, Windows Store for Business, and Windows 10. We'll show you the basics on how to:
- Acquire an Office 365 business domain
- Add Microsoft Intune and Azure Active Directory (AD) Premium licenses to your business tenant
diff --git a/smb/docfx.json b/smb/docfx.json
index 033a3552a9..2e849d2d22 100644
--- a/smb/docfx.json
+++ b/smb/docfx.json
@@ -3,7 +3,8 @@
"content": [
{
"files": [
- "**/*.md"
+ "**/*.md",
+ "**/*.yml"
],
"exclude": [
"**/obj/**",
@@ -27,7 +28,10 @@
],
"overwrite": [],
"externalReference": [],
- "globalMetadata": {},
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/smb/breadcrumb/toc.json"
+ },
"fileMetadata": {},
"template": [],
"dest": "smb"
diff --git a/store-for-business/breadcrumb/toc.yml b/store-for-business/breadcrumb/toc.yml
new file mode 100644
index 0000000000..456f809e33
--- /dev/null
+++ b/store-for-business/breadcrumb/toc.yml
@@ -0,0 +1,7 @@
+- name: Docs
+ tocHref: /
+ topicHref: /
+ items:
+ - name: Windows
+ tocHref: /windows
+ topicHref: /windows/windows-10
\ No newline at end of file
diff --git a/store-for-business/distribute-apps-from-your-private-store.md b/store-for-business/distribute-apps-from-your-private-store.md
index 828dc965f4..8c53c8e10d 100644
--- a/store-for-business/distribute-apps-from-your-private-store.md
+++ b/store-for-business/distribute-apps-from-your-private-store.md
@@ -63,7 +63,7 @@ Employees can claim apps that admins added to the private store by doing the fol
[Manage access to private store](manage-access-to-private-store.md)
-[Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
+[Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store)
diff --git a/store-for-business/distribute-apps-with-management-tool.md b/store-for-business/distribute-apps-with-management-tool.md
index 891c3c0ccc..f030d0d1ce 100644
--- a/store-for-business/distribute-apps-with-management-tool.md
+++ b/store-for-business/distribute-apps-with-management-tool.md
@@ -61,7 +61,7 @@ This diagram shows how you can use a management tool to distribute an online-lic
## Related topics
-[Configure MDM Provider](../manage/configure-mdm-provider-windows-store-for-business.md)
+[Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md)
[Manage apps you purchased from the Windows Store for Business with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx)
diff --git a/store-for-business/docfx.json b/store-for-business/docfx.json
new file mode 100644
index 0000000000..05874cfbb2
--- /dev/null
+++ b/store-for-business/docfx.json
@@ -0,0 +1,44 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md",
+ "**/**.yml"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "breadcrumb_path": "/microsoft-store/breadcrumb/toc.json",
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "ms.author": "trudyha",
+ "ms.technology": "windows",
+ "ms.topic": "article"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "store-for-business"
+ }
+}
\ No newline at end of file
diff --git a/store-for-business/images/aadjwsfb.jpg b/store-for-business/images/aadjwsfb.jpg
new file mode 100644
index 0000000000..428f1a26d4
Binary files /dev/null and b/store-for-business/images/aadjwsfb.jpg differ
diff --git a/store-for-business/images/wsfb-distribute.png b/store-for-business/images/wsfb-distribute.png
new file mode 100644
index 0000000000..d0482f6ebe
Binary files /dev/null and b/store-for-business/images/wsfb-distribute.png differ
diff --git a/store-for-business/images/wsfb-firstrun.png b/store-for-business/images/wsfb-firstrun.png
new file mode 100644
index 0000000000..2673567a1e
Binary files /dev/null and b/store-for-business/images/wsfb-firstrun.png differ
diff --git a/store-for-business/images/wsfb-inventory-viewlicense.png b/store-for-business/images/wsfb-inventory-viewlicense.png
new file mode 100644
index 0000000000..9fafad1aff
Binary files /dev/null and b/store-for-business/images/wsfb-inventory-viewlicense.png differ
diff --git a/store-for-business/images/wsfb-inventory.png b/store-for-business/images/wsfb-inventory.png
new file mode 100644
index 0000000000..b060fb30e4
Binary files /dev/null and b/store-for-business/images/wsfb-inventory.png differ
diff --git a/store-for-business/images/wsfb-inventoryaddprivatestore.png b/store-for-business/images/wsfb-inventoryaddprivatestore.png
new file mode 100644
index 0000000000..bb1152e35b
Binary files /dev/null and b/store-for-business/images/wsfb-inventoryaddprivatestore.png differ
diff --git a/store-for-business/images/wsfb-landing.png b/store-for-business/images/wsfb-landing.png
new file mode 100644
index 0000000000..beae0b52af
Binary files /dev/null and b/store-for-business/images/wsfb-landing.png differ
diff --git a/store-for-business/images/wsfb-licenseassign.png b/store-for-business/images/wsfb-licenseassign.png
new file mode 100644
index 0000000000..5904abb3b9
Binary files /dev/null and b/store-for-business/images/wsfb-licenseassign.png differ
diff --git a/store-for-business/images/wsfb-licensedetails.png b/store-for-business/images/wsfb-licensedetails.png
new file mode 100644
index 0000000000..53e0f5c935
Binary files /dev/null and b/store-for-business/images/wsfb-licensedetails.png differ
diff --git a/store-for-business/images/wsfb-licensereclaim.png b/store-for-business/images/wsfb-licensereclaim.png
new file mode 100644
index 0000000000..9f94cd3600
Binary files /dev/null and b/store-for-business/images/wsfb-licensereclaim.png differ
diff --git a/store-for-business/images/wsfb-manageinventory.png b/store-for-business/images/wsfb-manageinventory.png
new file mode 100644
index 0000000000..9a544ddc21
Binary files /dev/null and b/store-for-business/images/wsfb-manageinventory.png differ
diff --git a/store-for-business/images/wsfb-offline-distribute-mdm.png b/store-for-business/images/wsfb-offline-distribute-mdm.png
new file mode 100644
index 0000000000..ec0e77a9a9
Binary files /dev/null and b/store-for-business/images/wsfb-offline-distribute-mdm.png differ
diff --git a/store-for-business/images/wsfb-onboard-1.png b/store-for-business/images/wsfb-onboard-1.png
new file mode 100644
index 0000000000..012e91a845
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-1.png differ
diff --git a/store-for-business/images/wsfb-onboard-2.png b/store-for-business/images/wsfb-onboard-2.png
new file mode 100644
index 0000000000..2ff98fb1f7
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-2.png differ
diff --git a/store-for-business/images/wsfb-onboard-3.png b/store-for-business/images/wsfb-onboard-3.png
new file mode 100644
index 0000000000..ed9a61d353
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-3.png differ
diff --git a/store-for-business/images/wsfb-onboard-4.png b/store-for-business/images/wsfb-onboard-4.png
new file mode 100644
index 0000000000..d99185ddc6
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-4.png differ
diff --git a/store-for-business/images/wsfb-onboard-5.png b/store-for-business/images/wsfb-onboard-5.png
new file mode 100644
index 0000000000..68049f4425
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-5.png differ
diff --git a/store-for-business/images/wsfb-onboard-7.png b/store-for-business/images/wsfb-onboard-7.png
new file mode 100644
index 0000000000..38b7348b21
Binary files /dev/null and b/store-for-business/images/wsfb-onboard-7.png differ
diff --git a/store-for-business/images/wsfb-online-distribute-mdm.png b/store-for-business/images/wsfb-online-distribute-mdm.png
new file mode 100644
index 0000000000..4b0f7cbf3a
Binary files /dev/null and b/store-for-business/images/wsfb-online-distribute-mdm.png differ
diff --git a/store-for-business/images/wsfb-paid-app-temp.png b/store-for-business/images/wsfb-paid-app-temp.png
new file mode 100644
index 0000000000..89e3857d07
Binary files /dev/null and b/store-for-business/images/wsfb-paid-app-temp.png differ
diff --git a/store-for-business/images/wsfb-permissions-assignrole.png b/store-for-business/images/wsfb-permissions-assignrole.png
new file mode 100644
index 0000000000..de2e1785ba
Binary files /dev/null and b/store-for-business/images/wsfb-permissions-assignrole.png differ
diff --git a/store-for-business/images/wsfb-private-store-gpo.PNG b/store-for-business/images/wsfb-private-store-gpo.PNG
new file mode 100644
index 0000000000..5e7fe44ec2
Binary files /dev/null and b/store-for-business/images/wsfb-private-store-gpo.PNG differ
diff --git a/store-for-business/images/wsfb-privatestore.png b/store-for-business/images/wsfb-privatestore.png
new file mode 100644
index 0000000000..74c9f1690d
Binary files /dev/null and b/store-for-business/images/wsfb-privatestore.png differ
diff --git a/store-for-business/images/wsfb-privatestoreapps.png b/store-for-business/images/wsfb-privatestoreapps.png
new file mode 100644
index 0000000000..1ddb543796
Binary files /dev/null and b/store-for-business/images/wsfb-privatestoreapps.png differ
diff --git a/store-for-business/images/wsfb-renameprivatestore.png b/store-for-business/images/wsfb-renameprivatestore.png
new file mode 100644
index 0000000000..c6db282581
Binary files /dev/null and b/store-for-business/images/wsfb-renameprivatestore.png differ
diff --git a/store-for-business/images/wsfb-settings-mgmt.png b/store-for-business/images/wsfb-settings-mgmt.png
new file mode 100644
index 0000000000..2a7b590d19
Binary files /dev/null and b/store-for-business/images/wsfb-settings-mgmt.png differ
diff --git a/store-for-business/images/wsfb-settings-permissions.png b/store-for-business/images/wsfb-settings-permissions.png
new file mode 100644
index 0000000000..63d04d270b
Binary files /dev/null and b/store-for-business/images/wsfb-settings-permissions.png differ
diff --git a/store-for-business/images/wsfb-wsappaddacct.png b/store-for-business/images/wsfb-wsappaddacct.png
new file mode 100644
index 0000000000..5c0bd9a4ce
Binary files /dev/null and b/store-for-business/images/wsfb-wsappaddacct.png differ
diff --git a/store-for-business/images/wsfb-wsappprivatestore.png b/store-for-business/images/wsfb-wsappprivatestore.png
new file mode 100644
index 0000000000..9c29e7604c
Binary files /dev/null and b/store-for-business/images/wsfb-wsappprivatestore.png differ
diff --git a/store-for-business/images/wsfb-wsappsignin.png b/store-for-business/images/wsfb-wsappsignin.png
new file mode 100644
index 0000000000..c2c2631a94
Binary files /dev/null and b/store-for-business/images/wsfb-wsappsignin.png differ
diff --git a/store-for-business/images/wsfb-wsappworkacct.png b/store-for-business/images/wsfb-wsappworkacct.png
new file mode 100644
index 0000000000..5eb9035124
Binary files /dev/null and b/store-for-business/images/wsfb-wsappworkacct.png differ
diff --git a/store-for-business/index.md b/store-for-business/index.md
index 7a44c16541..b615b79543 100644
--- a/store-for-business/index.md
+++ b/store-for-business/index.md
@@ -22,7 +22,6 @@ Welcome to the Microsoft Store for Business and Education! You can use Microsoft
## In this section
-
| Topic | Description |
| ----- | ----------- |
| [Sign up and get started](sign-up-windows-store-for-business-overview.md) | IT admins can sign up for the Microsoft Store for Business and Education, and get started working with apps. |
@@ -30,7 +29,4 @@ Welcome to the Microsoft Store for Business and Education! You can use Microsoft
| [Manage apps](manage-apps-windows-store-for-business-overview.md) | Manage settings and access to apps in Microsoft Store for Business and Education. |
| [Device Guard signing portal](device-guard-signing-portal.md) | Device Guard signing is a Device Guard feature that is available in the Microsoft Store for Business and Education. It gives admins a single place to sign catalog files and code integrity policies. After admins have created catalog files for unsigned apps and signed the catalog files, they can add the signers to a code integrity policy. You can merge the code integrity policy with your existing policy to include your custom signing certificate. This allows you to trust the catalog files. |
| [Manage settings in the Microsoft Store for Business and Edcucation](manage-settings-windows-store-for-business.md) | You can add users and groups, as well as update some of the settings associated with the Azure Active Directory (AD) tenant |
-| [Troubleshoot Microsoft Store for Business and Education](troubleshoot-windows-store-for-business.md) | Troubleshooting topics for Microsoft Store for Business and Education. |
-
-
-
+| [Troubleshoot Microsoft Store for Business and Education](troubleshoot-windows-store-for-business.md) | Troubleshooting topics for Microsoft Store for Business and Education. |
\ No newline at end of file
diff --git a/store-for-business/manage-access-to-private-store.md b/store-for-business/manage-access-to-private-store.md
index 3c7b9b2b79..248ea4396f 100644
--- a/store-for-business/manage-access-to-private-store.md
+++ b/store-for-business/manage-access-to-private-store.md
@@ -59,14 +59,14 @@ If you're using Windows Store for Business and you want employees to only see ap
4. On the **Only display the private store within the Windows Store app** setting page, click **Enabled**, and then click **OK**.
-You can also prevent employees from using the Windows Store. For more information, see [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md).
+You can also prevent employees from using the Windows Store. For more information, see [Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store).
## Related topics
[Distribute apps using your private store](distribute-apps-from-your-private-store.md)
-[Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
+[Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store)
diff --git a/store-for-business/manage-apps-windows-store-for-business-overview.md b/store-for-business/manage-apps-windows-store-for-business-overview.md
index ffcae55303..e70e9b6b80 100644
--- a/store-for-business/manage-apps-windows-store-for-business-overview.md
+++ b/store-for-business/manage-apps-windows-store-for-business-overview.md
@@ -25,9 +25,6 @@ Manage settings and access to apps in Microsoft Store for Business.
| Topic | Description |
| ----- | ----------- |
| [Manage access to private store](manage-access-to-private-store.md) | You can manage access to your private store in Store for Business. |
-| [App inventory managemement for Windows Store for Business](app-inventory-managemement-windows-store-for-business.md) | You can manage all apps that you've acquired on your Inventory page. |
+| [App inventory managemement for Windows Store for Business](app-inventory-managemement-windows-store-for-business.md) | You can manage all apps that you've acquired on your **Inventory** page. |
| [Manage private store settings](manage-private-store-settings.md) | The private store is a feature in the Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store. |
-| [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content. |
-
-
-
+| [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content. |
\ No newline at end of file
diff --git a/store-for-business/windows-store-for-business-overview.md b/store-for-business/windows-store-for-business-overview.md
index a3a565c261..fa37237c48 100644
--- a/store-for-business/windows-store-for-business-overview.md
+++ b/store-for-business/windows-store-for-business-overview.md
@@ -81,7 +81,7 @@ While not required, you can use a management tool to distribute and manage apps.
The first step for getting your organization started with the Store for Business is signing up. To sign up for the Business store, you need an Azure AD account and you must be a Global Administrator for your organization.
-For more information, see [Sign up for the Store for Business](../manage/sign-up-windows-store-for-business.md).
+For more information, see [Sign up for the Store for Business](sign-up-windows-store-for-business.md).
### Set up
@@ -93,7 +93,7 @@ After your admin signs up for the Store for Business, they can assign roles to o
| Purchaser | | X | X | |
| Device Guard signer | | | | X |
-In some cases, admins will need to add Azure Active Directory (AD) accounts for their employees. For more information, see [Manage user accounts and groups](../manage/manage-users-and-groups-windows-store-for-business.md).
+In some cases, admins will need to add Azure Active Directory (AD) accounts for their employees. For more information, see [Manage user accounts and groups](manage-users-and-groups-windows-store-for-business.md).
Also, if your organization plans to use a management tool, you’ll need to configure your management tool to sync with the Store for Business.
@@ -115,7 +115,7 @@ Line-of-business (LOB) apps are also supported via the Business store. You can i
The Business store supports two options to license apps: online and offline. **Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center.
-For more information, see [Apps in the Store for Business](../manage/apps-in-windows-store-for-business.md#licensing-model).
+For more information, see [Apps in the Store for Business](apps-in-windows-store-for-business.md#licensing-model).
### Distribute apps and content
@@ -137,7 +137,7 @@ App distribution is handled through two channels, either through the Store for B
Management tools can synchronize content that has been acquired in the Store for Business. If an offline application has been purchased this will also include the app package, license and metadata for the app (like, icons, count, or localized product descriptions). Using the metadata, management tools can enable portals or apps as a destination for employees to acquire apps.
-For more information, see [Distribute apps to your employees from the Store for Business](../manage/distribute-apps-to-your-employees-windows-store-for-business.md).
+For more information, see [Distribute apps to your employees from the Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
### Manage Store for Business settings and content
@@ -167,7 +167,7 @@ Once you are signed up with the Business store and have purchased apps, Admins c
- Download apps for offline installs
-For more information, see [Manage settings in the Store for Business](../manage/manage-settings-windows-store-for-business.md) and [Manage apps](../manage/manage-apps-windows-store-for-business-overview.md).
+For more information, see [Manage settings in the Store for Business](manage-settings-windows-store-for-business.md) and [Manage apps](manage-apps-windows-store-for-business-overview.md).
## Supported markets
@@ -353,4 +353,4 @@ Developers in your organization, or ISVs can create content specific to your org
Once the app is in inventory, admins can choose how to distribute the app. ISVs creating apps through the dev center can make their apps available in the Store for Business. ISVs can opt-in their apps to make them available for offline licensing. Apps purchased in the Store for Business will work only on Windows 10.
-For more information on line-of-business apps, see [Working with Line-of-Business apps](../manage/working-with-line-of-business-apps.md).
+For more information on line-of-business apps, see [Working with Line-of-Business apps](working-with-line-of-business-apps.md).
diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
new file mode 100644
index 0000000000..627724bbe5
--- /dev/null
+++ b/windows/access-protection/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-access-protection"
+ }
+}
\ No newline at end of file
diff --git a/windows/access-protection/index.md b/windows/access-protection/index.md
index 7bb298b7a0..04b1311ba7 100644
--- a/windows/access-protection/index.md
+++ b/windows/access-protection/index.md
@@ -25,4 +25,4 @@ Learn more about access protection technologies in Windows 10 and Windows 10 M
| [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md) | Provides a collection of references topics about smart cards, which are tamper-resistant portable storage devices that can enhance the security of tasks such as authenticating clients, signing code, securing e-mail, and signing in with a Windows domain account. |
| [Windows Hello for Business](hello-for-business/hello-identity-verification.md) | In Windows 10, Windows Hello replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and a biometric or PIN. |
| [Windows Firewall with Advanced Security](windows-firewall/windows-firewall-with-advanced-security.md) | Provides information about Windows Firewall with Advanced Security, which is an important part of a layered security model. By providing host-based, two-way network traffic filtering for a device, Windows Firewall with Advanced Security blocks unauthorized network traffic flowing into or out of the local device. |
-| [Windows 10 Credential Theft Mitigation Guide Abstract](windows-credential-theft-mitigation-guide-abstract.md) | Learn more about credential theft mitigation in Windows 10. |
\ No newline at end of file
+| [Windows 10 Credential Theft Mitigation Guide Abstract](windows-credential-theft-mitigation-guide-abstract.md) | Learn more about credential theft mitigation in Windows 10. |
diff --git a/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
index e82ec6f3d5..fc03f88ce9 100644
--- a/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
+++ b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
@@ -63,7 +63,7 @@ netsh advfirewall set allprofiles state on
Set-NetFirewallProfile -Profile Domain,Public,Private -Enabled True
```
-### Control firewall behavior
+### Control Windows Firewall behavior
The global default settings can be defined through the command-line interface. These modifications are also available through the Windows Firewall with Advanced Security console.
@@ -84,6 +84,30 @@ Windows PowerShell
Set-NetFirewallProfile -DefaultInboundAction Block -DefaultOutboundAction Allow –NotifyOnListen True -AllowUnicastResponseToMulticast True –LogFileName %SystemRoot%\System32\LogFiles\Firewall\pfirewall.log
```
+### Disable Windows Firewall
+
+Disabling Windows Firewall with Advanced Security can cause the following problems:
+
+- Start menu can stop working
+- Modern applications can fail to install or update
+- Activation of Windows via phone fails
+- Application or OS incompatibilities that depend on Windows Firewall
+
+Do not disable Windows Firewall with Advanced Security service by stopping the service.
+The proper method to disable the Windows Firewall is to disable the Windows Firewall Profiles and leave the service running.
+Use the following procedure to turn the firewall off, or disable the Group Policy setting **Computer Configuration|Administrative Templates|Network|Network Connections|Windows Firewall|Domain Prolfile|Windows Firewall:Protect all network connections**.
+For more information, see [Windows firewall with advanced security deployment guide](windows-firewall-with-advanced-security-deployment-guide.md).
+If you turn off the Windows Firewall with Advanced Security service, you lose other benefits provided by the service, such as the ability to use Internet Protocol security (IPsec) connection security rules, network protection from attacks that employ network fingerprinting, [Windows Service Hardening](http://go.microsoft.com/fwlink/?linkid=104976), and [boot time filters](https://blogs.technet.microsoft.com/networking/2009/03/24/stopping-the-windows-authenticating-firewall-service-and-the-boot-time-policy/).
+Non-Microsoft firewall software can programmatically disable only the parts of Windows Firewall with Advanced Security that need to be disabled for compatibility.
+You should not disable the firewall yourself for this purpose.
+Stopping the service associated with Windows Firewall with Advanced Security is not supported by Microsoft.
+
+The following example disables Windows Firewall with Advanced Security for all profiles.
+
+```powershell
+Set-NetFirewallProfile -Profile Domain,Public,Private -Enabled False
+```
+
## Deploy basic firewall rules
This section provides scriptlet examples for creating, modifying, and deleting firewall rules.
diff --git a/windows/application-management/app-v/appv-auto-batch-sequencing.md b/windows/application-management/app-v/appv-auto-batch-sequencing.md
index 2722febd18..a90e25e2eb 100644
--- a/windows/application-management/app-v/appv-auto-batch-sequencing.md
+++ b/windows/application-management/app-v/appv-auto-batch-sequencing.md
@@ -35,7 +35,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
2. Add the following required XML info for each app:
- - **<Name>.** The name of the app you're adding to the package.
+ - **<AppName>.** The name of the app you're adding to the package.
- **<InstallerFolder>.** The file path to the folder with the app installer.
@@ -55,7 +55,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
- Skype for Windows
+ Skype for Windows
D:\Install\New\SkypeforWindows
SkypeSetup.exe
/S
@@ -64,7 +64,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
True
- Power BI
+ Power BI
D:\Install\New\MicrosoftPowerBI
PBIDesktop.msi
/S
@@ -97,7 +97,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
2. Add the following required XML info for each app:
- - **<Name>.** The name of the app you're adding to the package.
+ - **<AppName>.** The name of the app you're adding to the package.
- **<InstallerFolder>.** The file path to the folder with the app installer.
@@ -115,7 +115,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
- Skype for Windows
+ Skype for Windows
D:\Install\New\SkypeforWindows
SkypeSetup.exe
20
@@ -123,7 +123,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
True
- Power BI
+ Power BI
D:\Install\New\MicrosoftPowerBI
PBIDesktop.msi
20
diff --git a/windows/application-management/app-v/appv-auto-batch-updating.md b/windows/application-management/app-v/appv-auto-batch-updating.md
index 3c9a7531bc..0430b81a0b 100644
--- a/windows/application-management/app-v/appv-auto-batch-updating.md
+++ b/windows/application-management/app-v/appv-auto-batch-updating.md
@@ -29,7 +29,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
2. Add the following XML info for each app:
- - **<Name>.** The name of the app you're adding to the package.
+ - **<AppName>.** The name of the app you're adding to the package.
- **<InstallerFolder>.** The file path to the folder with the app installer.
@@ -50,7 +50,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
- Skype for Windows Update
+ Skype for Windows Update
D:\Install\Update\SkypeforWindows
SkypeSetup.exe
/S
@@ -60,7 +60,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
True
- Microsoft Power BI Update
+ Microsoft Power BI Update
D:\Install\Update\PowerBI
PBIDesktop.msi
/S
@@ -95,7 +95,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
2. Add the following XML info for each app:
- - **<Name>.** The name of the app you're adding to the package.
+ - **<AppName>.** The name of the app you're adding to the package.
- **<InstallerFolder>.** The file path to the folder with the app installer.
@@ -115,7 +115,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
- Skype for Windows Update
+ Skype for Windows Update
D:\Install\Update\SkypeforWindows
SkypeSetup.exe
/S
@@ -125,7 +125,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
True
- Microsoft Power BI Update
+ Microsoft Power BI Update
D:\Install\Update\PowerBI
PBIDesktop.msi
/S
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
new file mode 100644
index 0000000000..a0c06828be
--- /dev/null
+++ b/windows/application-management/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-app-management"
+ }
+}
\ No newline at end of file
diff --git a/windows/application-management/index.md b/windows/application-management/index.md
index 2302c372d1..9fd65e3fa8 100644
--- a/windows/application-management/index.md
+++ b/windows/application-management/index.md
@@ -20,4 +20,3 @@ Learn about managing applications in Window 10 and Windows 10 Mobile clients.
|---|---|
|[App-V](app-v/appv-getting-started.md)| Microsoft Application Virtualization (App-V) for Windows 10 enables organizations to deliver Win32 applications to users as virtual applications|
|[Sideload apps in Windows 10](sideload-apps-in-windows-10.md)| Requirements and instructions for side-loading LOB applications on Windows 10 and Windows 10 Mobile clients|
-
diff --git a/windows/client-management/TOC.md b/windows/client-management/TOC.md
index bc68853b9d..82de2c56b1 100644
--- a/windows/client-management/TOC.md
+++ b/windows/client-management/TOC.md
@@ -7,4 +7,5 @@
## [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
## [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)
## [Windows 10 Mobile deployment and management guide](windows-10-mobile-and-mdm.md)
-## [Windows libraries](windows-libraries.md)
\ No newline at end of file
+## [Windows libraries](windows-libraries.md)
+## [Change history for Client management](change-history-for-client-management.md)
diff --git a/windows/client-management/change-history-for-client-management.md b/windows/client-management/change-history-for-client-management.md
new file mode 100644
index 0000000000..e0349be98b
--- /dev/null
+++ b/windows/client-management/change-history-for-client-management.md
@@ -0,0 +1,23 @@
+---
+title: Change history for Client management (Windows 10)
+description: This topic lists changes to documentation for configuring Windows 10.
+keywords:
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: security
+localizationpriority: high
+author: jdeckerMS
+---
+
+# Change history for Client management
+
+This topic lists new and updated topics in the [Client management](index.md) documentation for Windows 10 and Windows 10 Mobile.
+
+
+
+## RELEASE: Windows 10, version 1703
+
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The following new topic has been added:
+
+- [Manage the Settings app with Group Policy](manage-settings-app-with-group-policy.md)
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
new file mode 100644
index 0000000000..107c56cde2
--- /dev/null
+++ b/windows/client-management/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-client-management"
+ }
+}
\ No newline at end of file
diff --git a/windows/client-management/index.md b/windows/client-management/index.md
index 9360321453..b26f244d6c 100644
--- a/windows/client-management/index.md
+++ b/windows/client-management/index.md
@@ -8,7 +8,7 @@ author: jdeckerMS
localizationpriority: medium
---
-# Client Management
+# Client management
**Applies to**
- Windows 10
@@ -28,3 +28,4 @@ Learn about the administrative tools, tasks and best practices for managing Wind
|[Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md)| Instructions for resetting a Windows 10 Mobile device using either *factory* or *'wipe and persist'* reset options|
|[Deploy Windows 10 Mobile](windows-10-mobile-and-mdm.md)| Considerations and instructions for deploying Windows 10 Mobile|
|[Windows libraries](windows-libraries.md)| Considerations and instructions for managing Windows 10 libraries such as My Documents, My Pictures, and My Music.|
+|[Change history for Client management](change-history-for-client-management.md) | This topic lists new and updated topics in the Client management documentation for Windows 10 and Windows 10 Mobile. |
\ No newline at end of file
diff --git a/windows/configuration/TOC.md b/windows/configuration/TOC.md
index 962281e962..0664c17101 100644
--- a/windows/configuration/TOC.md
+++ b/windows/configuration/TOC.md
@@ -88,5 +88,4 @@
#### [Synchronizing Microsoft Office with UE-V](ue-v/uev-synchronizing-microsoft-office-with-uev.md)
#### [Application Template Schema Reference for UE-V](ue-v/uev-application-template-schema-reference.md)
#### [Security Considerations for UE-V](ue-v/uev-security-considerations.md)
-
## [Change history for Configure Windows 10](change-history-for-configure-windows-10.md)
diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md
index 8398eff1df..726fbd96c4 100644
--- a/windows/configuration/change-history-for-configure-windows-10.md
+++ b/windows/configuration/change-history-for-configure-windows-10.md
@@ -14,6 +14,12 @@ author: jdeckerMS
This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
+## April 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [Set up a shared or guest PC with Windows 10](set-up-shared-or-guest-pc.md) | Added instructions for using WMI bridge to configure shared PC |
+
## RELEASE: Windows 10, version 1703
diff --git a/windows/configuration/configure-windows-telemetry-in-your-organization.md b/windows/configuration/configure-windows-telemetry-in-your-organization.md
index 657bb0863c..7edc786a66 100644
--- a/windows/configuration/configure-windows-telemetry-in-your-organization.md
+++ b/windows/configuration/configure-windows-telemetry-in-your-organization.md
@@ -98,7 +98,7 @@ Windows telemetry also helps Microsoft better understand how customers use (or d
### Insights into your own organization
-Sharing information with Microsoft helps make Windows and other products better, but it can also help make your internal processes and user experiences better, as well. Microsoft is in the process of developing a set of analytics customized for your internal use. The first of these, called [Upgrade Readiness](../deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness.md).
+Sharing information with Microsoft helps make Windows and other products better, but it can also help make your internal processes and user experiences better, as well. Microsoft is in the process of developing a set of analytics customized for your internal use. The first of these, called [Upgrade Readiness](/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness).
#### Upgrade Readiness
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
new file mode 100644
index 0000000000..07ca5a5dc2
--- /dev/null
+++ b/windows/configuration/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-configuration"
+ }
+}
\ No newline at end of file
diff --git a/windows/configuration/manage-tips-and-suggestions.md b/windows/configuration/manage-tips-and-suggestions.md
index 2af7244b3d..333e59cee7 100644
--- a/windows/configuration/manage-tips-and-suggestions.md
+++ b/windows/configuration/manage-tips-and-suggestions.md
@@ -50,7 +50,7 @@ Windows 10, version 1607 (also known as the Anniversary Update), provides organi
- [Manage Windows 10 Start layout](windows-10-start-layout-options-and-policies.md)
- [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md)
-- [Windows spotlight on the lock screen](../whats-new/windows-spotlight.md)
+- [Windows spotlight on the lock screen](windows-spotlight.md)
- [Windows 10 editions for education customers](https://technet.microsoft.com/en-us/edu/windows/windows-editions-for-education-customers)
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 68d3432d27..e93bdd976e 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -85,7 +85,28 @@ You can configure Windows to be in shared PC mode in a couple different ways:
-- WMI bridge: Environments that use Group Policy can use the WMI bridge to configure the [SharedPC CSP](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx).
+- WMI bridge: Environments that use Group Policy can use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/desktop/dn905224.aspx) to configure the [MDM_SharedPC class](https://msdn.microsoft.com/library/windows/desktop/mt779129.aspx). For example, open PowerShell as an administrator and enter the following:
+
+```
+$sharedPC = Get-CimInstance -Namespace "root\cimv2\mdm\dmmap" -ClassName "MDM_SharedPC"
+$sharedPC.EnableSharedPCMode = $True
+$sharedPC.SetEduPolicies = $True
+$sharedPC.SetPowerPolicies = $True
+$sharedPC.MaintenanceStartTime = 0
+$sharedPC.SignInOnResume = $True
+$sharedPC.SleepTimeout = 0
+$sharedPC.EnableAccountManager = $True
+$sharedPC.AccountModel = 2
+$sharedPC.DeletionPolicy = 1
+$sharedPC.DiskLevelDeletion = 25
+$sharedPC.DiskLevelCaching = 50
+$sharedPC.RestrictLocalStorage = $False
+$sharedPC.KioskModeAUMID = ""
+$sharedPC.KioskModeUserTileDisplayText = ""
+$sharedPC.InactiveThreshold = 0
+Set-CimInstance -CimInstance $sharedPC
+Get-CimInstance -Namespace $namespaceName -ClassName $MDM_SharedPCClass
+```
### Create a provisioning package for shared use
diff --git a/windows/configuration/windows-spotlight.md b/windows/configuration/windows-spotlight.md
index c3a078d793..42bb79449f 100644
--- a/windows/configuration/windows-spotlight.md
+++ b/windows/configuration/windows-spotlight.md
@@ -79,7 +79,7 @@ Pay attention to the checkbox in **Options**. In addition to providing the path
## Related topics
-[Manage Windows 10 Start layout options](../manage/windows-10-start-layout-options-and-policies.md)
+[Manage Windows 10 Start layout options](windows-10-start-layout-options-and-policies.md)
diff --git a/windows/configure/docfx.json b/windows/configure/docfx.json
new file mode 100644
index 0000000000..fa97b029d7
--- /dev/null
+++ b/windows/configure/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "windows-configure"
+ }
+}
\ No newline at end of file
diff --git a/windows/deploy/docfx.json b/windows/deploy/docfx.json
new file mode 100644
index 0000000000..446c7aa4f2
--- /dev/null
+++ b/windows/deploy/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "windows-deploy"
+ }
+}
\ No newline at end of file
diff --git a/windows/deployment/change-history-for-deploy-windows-10.md b/windows/deployment/change-history-for-deploy-windows-10.md
index c6d22274f0..1fa15b38c4 100644
--- a/windows/deployment/change-history-for-deploy-windows-10.md
+++ b/windows/deployment/change-history-for-deploy-windows-10.md
@@ -21,7 +21,7 @@ This topic lists new and updated topics in the [Deploy Windows 10](index.md) doc
## RELEASE: Windows 10, version 1703
-The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](../configuration/index.md).
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](/windows/configuration/index.md).
## March 2017
@@ -37,14 +37,14 @@ The topics in this library have been updated for Windows 10, version 1703 (also
|----------------------|-------------|
| [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | Multiple topics updated, name changed from Upgrade Analytics to Upgrade Readiness, and other content updates. |
| [USMT Requirements](usmt/usmt-requirements.md) | Updated: Vista support removed and other minor changes |
-| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated structure and content |
-| [Upgrade Analytics deployment script](upgrade/upgrade-analytics-deployment-script.md) | Added as a separate page from get started |
-| [Use Upgrade Analytics to manage Windows upgrades](upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
-| [Upgrade Analytics - Upgrade overview](upgrade/upgrade-analytics-upgrade-overview.md) | New |
-| [Upgrade Analytics - Step 1: Identify important apps](upgrade/upgrade-analytics-identify-apps.md) | Updated topic title and content |
-| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | New |
-| [Upgrade Analytics - Step 3: Deploy Windows](upgrade/upgrade-analytics-deploy-windows.md) | New |
-| [Upgrade Analytics - Additional insights](upgrade/upgrade-analytics-additional-insights.md) | New |
+| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated structure and content |
+| [Upgrade Analytics deployment script](upgrade/upgrade-readiness-deployment-script.md) | Added as a separate page from get started |
+| [Use Upgrade Analytics to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md) | Updated with links to new content and information about the target OS setting |
+| [Upgrade Analytics - Upgrade overview](upgrade/upgrade-readiness-upgrade-overview.md) | New |
+| [Upgrade Analytics - Step 1: Identify important apps](upgrade/upgrade-readiness-identify-apps.md) | Updated topic title and content |
+| [Upgrade Analytics - Step 2: Resolve app and driver issues](upgrade/upgrade-readiness-resolve-issues.md) | New |
+| [Upgrade Analytics - Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md) | New |
+| [Upgrade Analytics - Additional insights](upgrade/upgrade-readiness-additional-insights.md) | New |
## January 2017
@@ -53,18 +53,18 @@ The topics in this library have been updated for Windows 10, version 1703 (also
| [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md) | New |
| [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) | New |
| [Deploy Windows 10 in a test lab using System Center Configuration Manager](windows-10-poc-sc-config-mgr.md) | New |
-| [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) | New (previously published in other topics) |
-| [Create a provisioning package for Windows 10](../configuration/provisioning-packages/provisioning-create-package.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Create a provisioning package with multivariant settings](../configuration/provisioning-packages/provisioning-multivariant.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [How provisioning works in Windows 10](../configuration/provisioning-packages/provisioning-how-it-works.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Install Windows Imaging and Configuration Designer](../configuration/provisioning-packages/provisioning-install-icd.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [NFC-based device provisioning](../configuration/mobile-devices/provisioning-nfc.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Settings changed when you uninstall a provisioning package](../configuration/provisioning-packages/provisioning-uninstall-package.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Use a script to install a desktop app in provisioning packages](../configuration/provisioning-packages/provisioning-script-to-install-app.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Windows ICD command-line interface (reference)](../configuration/provisioning-packages/provisioning-command-line.md) | New (previously published in Hardware Dev Center on MSDN) |
-| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
-| [Provision PCs with common settings for initial deployment (simple provisioning)](../configuration/provisioning-packages/provision-pcs-for-initial-deployment.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) |
-| [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](../configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](../configuration/provisioning-packages/provisioning-apply-package.md) |
+| [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package.md) | New (previously published in other topics) |
+| [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Create a provisioning package with multivariant settings](/windows/configuration/provisioning-packages/provisioning-multivariant.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [How provisioning works in Windows 10](/windows/configuration/provisioning-packages/provisioning-how-it-works.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Install Windows Imaging and Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [NFC-based device provisioning](/windows/configuration/mobile-devices/provisioning-nfc.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Settings changed when you uninstall a provisioning package](/windows/configuration/provisioning-packages/provisioning-uninstall-package.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Use a script to install a desktop app in provisioning packages](/windows/configuration/provisioning-packages/provisioning-script-to-install-app.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Windows ICD command-line interface (reference)](/windows/configuration/provisioning-packages/provisioning-command-line.md) | New (previously published in Hardware Dev Center on MSDN) |
+| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated exit code table with suggested fixes, and added link to the Upgrade Analytics blog |
+| [Provision PCs with common settings for initial deployment (simple provisioning)](/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package.md) |
+| [Provision PCs with apps and certificates for initial deployments (advanced provisioning)](/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md) | Instructions for applying the provisioning package moved to [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package.md) |
## October 2016
@@ -76,17 +76,17 @@ The topics in this library have been updated for Windows 10, version 1703 (also
| New or changed topic | Description |
|----------------------|-------------|
| [Windows 10 Enterprise E3 in CSP Overview](windows-10-enterprise-e3-overview.md) | New |
-| [Get started with Upgrade Analytics](upgrade/upgrade-analytics-get-started.md) | Updated with prerequisites for site discovery |
-| [Resolve application and driver issues](upgrade/upgrade-analytics-resolve-issues.md) | Updated with app status info for Ready For Windows |
-| [Review site discovery](upgrade/upgrade-analytics-additional-insights.md) | New |
+| [Get started with Upgrade Analytics](upgrade/upgrade-readiness-get-started.md) | Updated with prerequisites for site discovery |
+| [Resolve application and driver issues](upgrade/upgrade-readiness-resolve-issues.md) | Updated with app status info for Ready For Windows |
+| [Review site discovery](upgrade/upgrade-readiness-additional-insights.md) | New |
## RELEASE: Windows 10, version 1607
The topics in this library have been updated for Windows 10, version 1607 (also known as the Anniversary Update). The following new topics have been added:
-- [Provisioning packages for Windows 10](../configuration/provisioning-packages/provisioning-packages.md)
-- [Provision PCs with apps and certificates for initial deployment](../configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md)
-- [Provision PCs with common settings for initial deployment](../configuration/provisioning-packages/provision-pcs-for-initial-deployment.md)
+- [Provisioning packages for Windows 10](/windows/configuration/provisioning-packages/provisioning-packages.md)
+- [Provision PCs with apps and certificates for initial deployment](/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md)
+- [Provision PCs with common settings for initial deployment](/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md)
## August 2016
| New or changed topic | Description |
@@ -96,7 +96,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
## July 2016
| New or changed topic | Description |
|----------------------|-------------|
-| [Manage Windows upgrades with Upgrade Analytics](upgrade/manage-windows-upgrades-with-upgrade-analytics.md) | New |
+| [Manage Windows upgrades with Upgrade Analytics](upgrade/manage-windows-upgrades-with-upgrade-readiness.md) | New |
## June 2016
| New or changed topic | Description |
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
new file mode 100644
index 0000000000..652028bf85
--- /dev/null
+++ b/windows/deployment/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-development"
+ }
+}
\ No newline at end of file
diff --git a/windows/deployment/images/UR-lift-report.jpg b/windows/deployment/images/UR-lift-report.jpg
new file mode 100644
index 0000000000..f76ce5f481
Binary files /dev/null and b/windows/deployment/images/UR-lift-report.jpg differ
diff --git a/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md b/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
index 8c0f4c791f..ec9afa1603 100644
--- a/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
+++ b/windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
@@ -42,7 +42,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description |
|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
-|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
+|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
| [Windows 10 servicing overview](../update/waas-overview.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md) page. |
diff --git a/windows/deployment/update/index.md b/windows/deployment/update/index.md
index e600862575..dad9a37627 100644
--- a/windows/deployment/update/index.md
+++ b/windows/deployment/update/index.md
@@ -36,10 +36,10 @@ Windows as a service provides a new way to think about building, deploying, and
| [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Explains how to assign devices to Current Branch (CB) or Current Branch for Business (CBB) for feature and quality updates, and how to enroll devices in Windows Insider. |
| [Monitor Windows Updates with Update Compliance](update-compliance-monitor.md) | Explains how to use Windows Analytics: Update Compliance to monitor and manage Windows Updates on devices in your organization. |
| [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) | Explains the benefits of using Delivery Optimization or BranchCache for update distribution. |
-| [Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) | Explains updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. |
-| [Manage updates using Windows Update for Business](waas-manage-updates-wufb.md) | Explains how to use Windows Update for Business to manage when devices receive updates directly from Windows Update. Includes walkthroughs for configuring Windows Update for Business using Group Policy and Microsoft Intune. |
-| [Manage Windows 10 updates using Windows Server Update Services (WSUS)](waas-manage-updates-wsus.md) | Explains how to use WSUS to manage Windows 10 updates. |
-| [Manage Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) | Explains how to use Configuration Manager to manage Windows 10 updates. |
+| [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) | Explains updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. |
+| [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md) | Explains how to use Windows Update for Business to manage when devices receive updates directly from Windows Update. Includes walkthroughs for configuring Windows Update for Business using Group Policy and Microsoft Intune. |
+| [Deploy Windows 10 updates using Windows Server Update Services (WSUS)](waas-manage-updates-wsus.md) | Explains how to use WSUS to manage Windows 10 updates. |
+| [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md) | Explains how to use Configuration Manager to manage Windows 10 updates. |
| [Manage device restarts after updates](waas-restart.md) | Explains how to use Group Policy to manage device restarts. |
| [Windows Insider Program for Business](waas-windows-insider-for-business.md) | Explains how the Windows Insider Program for Business works and how to become an insider. |
diff --git a/windows/deployment/update/waas-manage-updates-configuration-manager.md b/windows/deployment/update/waas-manage-updates-configuration-manager.md
index d78e5d9504..6d68004a30 100644
--- a/windows/deployment/update/waas-manage-updates-configuration-manager.md
+++ b/windows/deployment/update/waas-manage-updates-configuration-manager.md
@@ -1,5 +1,5 @@
---
-title: Manage Windows 10 updates using System Center Configuration Manager (Windows 10)
+title: Deploy Windows 10 updates using System Center Configuration Manager (Windows 10)
description: System Center Configuration Manager provides maximum control over quality and feature updates for Windows 10.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/deployment/update/waas-manage-updates-wsus.md b/windows/deployment/update/waas-manage-updates-wsus.md
index afbaf3cfaf..2c9f7a83e5 100644
--- a/windows/deployment/update/waas-manage-updates-wsus.md
+++ b/windows/deployment/update/waas-manage-updates-wsus.md
@@ -1,5 +1,5 @@
---
-title: Manage Windows 10 updates using Windows Server Update Services (Windows 10)
+title: Deploy Windows 10 updates using Windows Server Update Services (Windows 10)
description: WSUS allows companies to defer, selectively approve, choose when delivered, and determine which devices receive updates.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/deployment/update/waas-manage-updates-wufb.md b/windows/deployment/update/waas-manage-updates-wufb.md
index 75bd5b81d8..98b6cc928a 100644
--- a/windows/deployment/update/waas-manage-updates-wufb.md
+++ b/windows/deployment/update/waas-manage-updates-wufb.md
@@ -1,5 +1,5 @@
---
-title: Manage updates using Windows Update for Business (Windows 10)
+title: Deploy updates using Windows Update for Business (Windows 10)
description: Windows Update for Business lets you manage when devices received updates from Windows Update.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/deployment/update/waas-mobile-updates.md b/windows/deployment/update/waas-mobile-updates.md
index 267cfb37c2..570725361b 100644
--- a/windows/deployment/update/waas-mobile-updates.md
+++ b/windows/deployment/update/waas-mobile-updates.md
@@ -1,5 +1,5 @@
---
-title: Manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile (Windows 10)
+title: Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile (Windows 10)
description: tbd
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md b/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
index fa78ac3fc5..99c0566d7f 100644
--- a/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
+++ b/windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
@@ -30,7 +30,7 @@ Windows 10 spreads the traditional deployment effort of a Windows upgrade, which
- **Identify excluded PCs.** For some organizations, special-purpose devices such as those used to control factory or medical equipment or run ATMs require a stricter, less frequent feature update cycle than CB or Current Branch for Business (CBB) can offer. For those machines, you must install Windows 10 Enterprise LTSB to avoid feature updates for up to 10 years. Identify these PCs, and separate them from the phased deployment and servicing cycles to help remove confusion for your administrators and ensure that devices are handled correctly.
- **Recruit volunteers.** The purpose of testing a deployment is to receive feedback. One effective way to recruit pilot users is to request volunteers. When doing so, clearly state that you’re looking for feedback rather than people to just “try it out” and that there could be occasional issues involved with accepting feature updates right away. With Windows as a service, the expectation is that there should be few issues, but if an issue does arise, you want testers to let you know as soon as possible. When considering whom to recruit for pilot groups, be sure to include members who provide the broadest set of applications and devices to validate the largest number of apps and devices possible.
- **Choose a servicing tool.** Decide which product you’ll use to manage the Windows updates in your environment. If you’re currently using Windows Server Update Services (WSUS) or System Center Configuration Manager to manage your Windows updates, you can continue using those products to manage Windows 10 updates. Alternatively, you can use Windows Update for Business. In addition to which product you’ll use, consider how you’ll deliver the updates. With Windows 10, multiple peer-to-peer options are available to make update distribution faster. For a comparison of tools, see [Servicing tools](waas-overview.md#servicing-tools).
-- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md).
+- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md).
>[!NOTE]
>This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](../planning/index.md).
diff --git a/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md b/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md
deleted file mode 100644
index 9b25d3cea1..0000000000
--- a/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-analytics.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Manage Windows upgrades with Upgrade Analytics (Windows 10)
-redirect_url: manage-windows-upgrades-with-upgrade-readiness
----
diff --git a/windows/deployment/upgrade/troubleshoot-upgrade-analytics.md b/windows/deployment/upgrade/troubleshoot-upgrade-analytics.md
deleted file mode 100644
index dc7f8428f2..0000000000
--- a/windows/deployment/upgrade/troubleshoot-upgrade-analytics.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Troubleshoot Upgrade Analytics (Windows 10)
-redirect_url: troubleshoot-upgrade-readiness
----
diff --git a/windows/deployment/upgrade/upgrade-analytics-additional-insights.md b/windows/deployment/upgrade/upgrade-analytics-additional-insights.md
deleted file mode 100644
index 3a3dd06910..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-additional-insights.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Upgrade Analytics - Additional insights
-redirect_url: upgrade-readiness-additional-insights
----
diff --git a/windows/deployment/upgrade/upgrade-analytics-architecture.md b/windows/deployment/upgrade/upgrade-analytics-architecture.md
deleted file mode 100644
index d1ab6fecdb..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-architecture.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Upgrade Analytics architecture (Windows 10)
-redirect_url: upgrade-readiness-architecture
----
diff --git a/windows/deployment/upgrade/upgrade-analytics-deploy-windows.md b/windows/deployment/upgrade/upgrade-analytics-deploy-windows.md
deleted file mode 100644
index 76c41c573a..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-deploy-windows.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Upgrade Analytics - Get a list of computers that are upgrade-ready (Windows 10)
-redirect_url: upgrade-readiness-deploy-windows
----
diff --git a/windows/deployment/upgrade/upgrade-analytics-deployment-script.md b/windows/deployment/upgrade/upgrade-analytics-deployment-script.md
deleted file mode 100644
index 0db5694e53..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-deployment-script.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Upgrade Analytics deployment script (Windows 10)
-redirect_url: upgrade-readiness-deployment-script
----
\ No newline at end of file
diff --git a/windows/deployment/upgrade/upgrade-analytics-get-started.md b/windows/deployment/upgrade/upgrade-analytics-get-started.md
deleted file mode 100644
index 575fd2ed00..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-get-started.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Get started with Upgrade Analytics (Windows 10)
-redirect_url: upgrade-readiness-get-started
----
\ No newline at end of file
diff --git a/windows/deployment/upgrade/upgrade-analytics-identify-apps.md b/windows/deployment/upgrade/upgrade-analytics-identify-apps.md
deleted file mode 100644
index 6ff2df414c..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-identify-apps.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Analytics - Identify important apps (Windows 10)
-redirect_url: upgrade-readiness-identify-apps
----
-
diff --git a/windows/deployment/upgrade/upgrade-analytics-requirements.md b/windows/deployment/upgrade/upgrade-analytics-requirements.md
deleted file mode 100644
index 1b99be1621..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-requirements.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Analytics requirements (Windows 10)
-redirect_url: upgrade-readiness-requirements
----
-
diff --git a/windows/deployment/upgrade/upgrade-analytics-resolve-issues.md b/windows/deployment/upgrade/upgrade-analytics-resolve-issues.md
deleted file mode 100644
index 9514c81869..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-resolve-issues.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Analytics - Resolve application and driver issues (Windows 10)
-redirect_url: upgrade-readiness-resolve-issues
----
-
diff --git a/windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md b/windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md
deleted file mode 100644
index 72c4b10125..0000000000
--- a/windows/deployment/upgrade/upgrade-analytics-upgrade-overview.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Upgrade Analytics - Upgrade Overview (Windows 10)
-redirect_url: upgrade-readiness-upgrade-overview
----
diff --git a/windows/deployment/upgrade/upgrade-readiness-release-notes.md b/windows/deployment/upgrade/upgrade-readiness-release-notes.md
index e023406035..38b0510215 100644
--- a/windows/deployment/upgrade/upgrade-readiness-release-notes.md
+++ b/windows/deployment/upgrade/upgrade-readiness-release-notes.md
@@ -1,5 +1,5 @@
---
title: Upgrade Readiness release notes (Windows 10)
description: Provides tips and limitations about Upgrade Readiness.
-redirect_url: https://technet.microsoft.com/itpro/windows/deploy/upgrade-readiness-requirements#important-information-about-this-release
+redirect_url: https://docs.microsoft.com/windows/deployment/upgrade/upgrade-readiness-requirements#important-information-about-this-release
---
\ No newline at end of file
diff --git a/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md b/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
index 3690e2c75d..9ca055c5f5 100644
--- a/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
+++ b/windows/deployment/upgrade/upgrade-readiness-resolve-issues.md
@@ -9,7 +9,16 @@ author: greg-lindsay
This section of the Upgrade Readiness workflow reports application and driver inventory and shows you which applications have known issues, which applications have no known issues, and which drivers have issues. We identify applications and drivers that need attention and suggest fixes when we know about them.
-You can change an application’s upgrade decision and a driver’s upgrade decision from the blades in this section. To change an application’s or a driver’s importance level, select **User changes**. Select the item you want to change and then select the appropriate option from the **Select upgrade decision** list.
+## In this section
+
+The blades in the **Step 2: Resolve issues** section are:
+
+- [Review applications with known issues](#review-applications-with-known-issues)
+- [Review applications with no known issues](#review-applications-with-no-known-issues)
+- [Review known driver issues](#review-known-driver-issues)
+- [Prioritize app and driver testing](#prioritize-app-and-driver-testing)
+
+>You can change an application’s upgrade decision and a driver’s upgrade decision from the blades in this section. To change an application’s or a driver’s importance level, select **User changes**. Select the item you want to change and then select the appropriate option from the **Select upgrade decision** list.
Upgrade decisions include:
@@ -19,13 +28,6 @@ Upgrade decisions include:
| Review in progress | When you start to investigate an application or a driver to determine upgrade readiness, change its upgrade decision to **Review in progress**.
Until you’ve determined that applications and drivers will migrate successfully or you’ve resolved blocking issues, leave the upgrade decision status as **Review in progress**.
| Once you’ve fixed any issues and validated that the application or driver will migrate successfully, change the upgrade decision to **Ready to upgrade**.
|
| Ready to upgrade | Mark applications and drivers **Ready to upgrade** once you’ve resolved all blocking issues and you’re confident that they will upgrade successfully, or if you’ve decided to upgrade them as-is. | Applications with no known issues and with low installation rates are marked **Ready to upgrade** by default.
In Step 1, you might have marked some of your apps as **Ignore**. These should be marked as **Ready to upgrade**. Apps with low installation rates are marked as **Ready to upgrade** by default. Be sure to review any low install count applications for any business critical or important applications that are not yet upgrade-ready, despite their low installation rates.
|
| Won’t upgrade | By default, no applications or drivers are marked **Won’t upgrade** because only you can make that determination.
Use **Won’t upgrade** for applications and drivers that you do not work on your target operating system, or that you are unable to upgrade.
| If, during your investigation into an application or driver, you determine that they should not or cannot be upgraded, mark them **Won’t upgrade**.
|
-
-The blades in the **Resolve issues** section are:
-
-- Review applications with known issues
-- Review applications with no known issues
-- Review drivers with known issues
-
As you review applications with known issues, you can also see ISV support statements or applications using [Ready for Windows](https://www.readyforwindows.com/).
## Review applications with known issues
@@ -150,3 +152,55 @@ To change a driver’s upgrade decision:
4. Click **Save** when finished.
+## Prioritize app and driver testing
+
+Planning and executing an OS upgrade project can be overwhelming. When you are tasked with evaluating thousands of applications and drivers to ensure a successful upgrade, it can be difficult to decide where to start. The Upgrade Readiness solution provides valuable assistance for you, helping to determine the most important apps and drivers to unblock and enabling you yo create a proposed action plan.
+
+### Proposed action plan
+
+The Upgrade Readiness proposed action plan is an optimally ordered list of apps and drivers that are in need of review. By testing apps and drivers in the order suggested by the proposed action plan, you are able to increase your number of “Ready to upgrade” computers in an efficient manner. The action plan can be a very powerful tool during upgrade planning – but it’s most helpful when it’s used correctly. This topic explains the proposed action plan, describes how to use it, and calls out a few misconceptions and invalid use cases that you should avoid.
+
+The proposed action plan represents the order thath Microsoft recommends you rationalize the upgrade-readiness of your apps and drivers. By validating apps and drivers in the order proposed, you can ensure that you are testing efficiently.
+
+Each item in the proposed action plan represents either an application or a driver that you have not yet marked “Ready to upgrade.”
+
+>Since “Low install count” apps are automatically marked “Ready to upgrade”, you will not see any of these apps in the proposed action plan.
+
+Each item in the plan has the following attributes:
+
+| Attribute | Description | Example value |
+|-----------------------|------------------------------------------|----------------|
+| ItemRank | The location of this item in the context of the proposed action plan. For example, the item with ItemRank 7 is the 7th item in the Plan. It is crucial that the Plan is viewed in order by increasing ItemRank. Sorting the Plan in any other way invalidates the insights that the Plan provides. | 7 |
+| ItemType | Whether this item is an app or driver -- possible values are: "App" and "Driver." | App |
+| ItemName | The name of the app or driver that is in need of review. | Microsoft Visual C++ 2005 Redistributable (x64) |
+| ItemVendor | The vendor of the app or driver. | Microsoft Corporation |
+| ItemVersion | The version of the app or driver. | 12.1.0.1 |
+| ItemLanguage | If this item is an application, then this field will be the language of the app. If the item is a driver, then this will say "N/A." | English |
+| ItemHardwareId | If this item is a driver, then this field will be the hardware id of the driver. If the item is an app, then this will say "N/A." | N/A |
+| Upgrade Decision | The upgrade decision you have provided for this app or driver. If you have not defined an upgrade decision, then you will see the default value of “Not reviewed.” | Review in progress |
+| ComputersUnblocked | Assuming you have already marked all previous items in the proposed action plan “Ready to upgrade”, this represents the number of additional computers that will become “Ready to upgrade” by testing this app or driver and giving it an upgrade decision of “Ready to upgrade”. For example, if ComputersUnblocked is 200, then resolving any issues associated with the app/driver in question will make 200 new computers “Ready to upgrade.” | 200 |
+| CumulativeUnblocked | The total number of computers that will become “Ready to upgrade” if you validate and mark this and all prior items in the proposed action plan “Ready to upgrade”. For example, if ItemRank is 7, and CumulativeUnblocked is 950, then fixing items 1 thru 7 in the proposed action plan will cause 950 of your computers to become “Ready to upgrade.” | 950 |
+| CumulativeUnblockedPct | The percentage of your machines that will become “Ready to upgrade” if you make this and all prior items in the proposed action plan “Ready to upgrade.” | 0.24 |
+
+See the following example action plan items (click the image for a full-size view):
+
+
+
+
+In this example, the 3rd item is an application: **Microsoft Bing Sports**, a modern app, version **4.20.951.0**, published by Microsoft. By validating this app and making its UpgradeDecision “Ready to upgrade”, you can potentially make **1014** computers “Ready to upgrade” – but only after you have already validated items 1 and 2 in the list. By marking items 1, 2, and 3 “Ready to upgrade”, 14779 of your computers will become upgrade-ready. This represents 10.96% of the machines in this workspace.
+
+#### Using the proposed action plan
+
+There are several valid use cases for the proposed action plan. But it’s always important to remember that the information presented in the Plan is only accurate when sorted by increasing Item Rank! Here are three potential cases in which you could use the proposed action plan:
+
+1. Quickly determine how many apps and drivers you’ll need to validate in order to make x% of your computers upgrade-ready. To determine this, simply find the first item in the Plan with a CumulativeUnblockedPct greater than or equal to your desired percentage of upgrade-ready computers. The corresponding ItemRank represents the smallest number of apps and drivers that you can validate in order to reach your upgrade readiness goal. The prior items in the proposed action plan itself represent the most efficient route to reaching your goal.
+
+2. Use the proposed action plan to prepare a small portion of your machines for a pilot of your target Operating System. Let’s say you want to test a new Operating System by upgrading a few hundred computers. You can use the proposed action plan to determine how many apps and drivers you will need to validate before you can be confident that your pilot will be successful.
+
+3. If your project deadline is approaching and you only have time to validate a few more apps and drivers, you can use the proposed action plan to determine which apps and drivers you should focus on to maximize the number of computers that you can confidently upgrade.
+
+#### Misconceptions and things to avoid
+
+The most common misconceptions about the proposed action plan involve the assumption that each item in the plan is independent of those around it. The apps and drivers in the plan must be considered in the correct order to draw valid conclusions. For example, if you choose to validate items 1, 3, 4, and 5 and mark each of them “Ready to upgrade,” the proposed action plan cannot tell you how many computers will become upgrade-ready as a result of your testing. Even the non-cumulative “ComputersUnblocked” count is dependent upon all prior issues having already been resolved.
+
+If an item with ItemRank = 7 has a ComputersUnblocked value of 50, do not assume that 50 of your computers will become upgrade-ready if you test this item. However, if you validate items 1 through 6 in the plan, you can make an additional 50 computers upgrade-ready by validating the 7th item in the plan.
\ No newline at end of file
diff --git a/windows/deployment/upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md b/windows/deployment/upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md
deleted file mode 100644
index 3d23267aa8..0000000000
--- a/windows/deployment/upgrade/use-upgrade-analytics-to-manage-windows-upgrades.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use Upgrade Analytics to manage Windows upgrades (Windows 10)
-redirect_url: use-upgrade-readiness-to-manage-windows-upgrades
----
diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md
index a1a498ca6d..3fb9bda5d9 100644
--- a/windows/deployment/upgrade/windows-10-edition-upgrades.md
+++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md
@@ -41,13 +41,16 @@ X = unsupported
- To upgrade mobile editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithLicense** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](https://go.microsoft.com/fwlink/p/?LinkID=690907).
## Upgrade using a provisioning package
-The Windows Imaging and Configuration Designer (ICD) tool is included in the Windows Assessment and Deployment Kit (ADK) for Windows 10. [Install the ADK.](https://go.microsoft.com/fwlink/p/?LinkId=526740)
+Use Windows Configuration Designer to create a provisioning package to upgrade a desktop edition or mobile edition of Windows 10. To get started, [install Windows Configuration Designer from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22).
-- To use Windows ICD to create a provisioning package for upgrading desktop editions of Windows 10, go to **Runtime settings > EditionUpgrade > UpgradeEditionWithProductKey** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
+- To create a provisioning package for upgrading desktop editions of Windows 10, go to **Runtime settings > EditionUpgrade > UpgradeEditionWithProductKey** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
-- To use Windows ICD to create a provisioning package for upgrading mobile editions of Windows 10, go to **Runtime settings > EditionUpgrade > UpgradeEditionWithLicense** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
+- To create a provisioning package for upgrading mobile editions of Windows 10, go to **Runtime settings > EditionUpgrade > UpgradeEditionWithLicense** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
+
+For more info about Windows Configuration Designer, see these topics:
+- [Create a provisioining package for Windows 10](https://docs.microsoft.com/en-us/windows/configuration/provisioning-packages/provisioning-create-package)
+- [Apply a provisioning package](https://docs.microsoft.com/en-us/windows/configuration/provisioning-packages/provisioning-apply-package)
-For more info on creating and applying a provisioning package using Windows ICD, see [Build and apply a provisioning package](https://go.microsoft.com/fwlink/p/?LinkID=533700).
## Upgrade using a command-line tool
You can run the changepk.exe command-line tool to upgrade devices to a supported edition of Windows 10:
@@ -80,13 +83,4 @@ If you do not have a product key, you can upgrade your edition of Windows 10 th
**Note**
If you are a Windows 10 Home N or Windows 10 Home KN user and have trouble finding your applicable upgrade in the Windows Store, click [here](ms-windows-store://windowsupgrade/).
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md b/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md
index f7f606af68..0a6428d6c9 100644
--- a/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md
+++ b/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md
@@ -16,10 +16,8 @@ localizationpriority: high
- Windows 10
- Windows 8.1
- Windows 8
-- Windows 7
- Windows Server 2012 R2
- Windows Server 2012
-- Windows Server 2008 R2
**Looking for retail activation?**
- [Get Help Activating Microsoft Windows](https://go.microsoft.com/fwlink/p/?LinkId=618644)
diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md
index d03f02811a..0ce8558c9c 100644
--- a/windows/deployment/windows-10-poc-sc-config-mgr.md
+++ b/windows/deployment/windows-10-poc-sc-config-mgr.md
@@ -52,8 +52,8 @@ Topics and procedures in this guide are summarized in the following table. An es
| [Create a task sequence](#create-a-task-sequence) | Create a Configuration Manager task sequence with MDT integration using the MDT wizard | 15 minutes
| | [Finalize the operating system configuration](#finalize-the-operating-system-configuration) | Enable monitoring, configure rules, and distribute content. | 30 minutes
| | [Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager) | Deploy Windows 10 using Configuration Manager deployment packages and task sequences. | 60 minutes
- | | [Refresh a client with Windows 10 using Configuration Manager](#refresh-a-client-with-windows-10-using-configuration-manager) | Use a task sequence to refresh a client with Windows 10 using Configuration Manager and MDT | 90 minutes
| | [Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager) | Replace a client computer with Windows 10 using Configuration Manager. | 90 minutes
+ | | [Refresh a client with Windows 10 using Configuration Manager](#refresh-a-client-with-windows-10-using-configuration-manager) | Use a task sequence to refresh a client with Windows 10 using Configuration Manager and MDT | 90 minutes
diff --git a/windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md b/windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md
index 17169f4a98..baad65e7bb 100644
--- a/windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md
+++ b/windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md
@@ -20,6 +20,7 @@ This section includes the following topics:
- [Deploy code integrity policies: policy rules and file rules](deploy-code-integrity-policies-policy-rules-and-file-rules.md)
- [Deploy code integrity policies: steps](deploy-code-integrity-policies-steps.md)
- [Deploy catalog files to support code integrity policies](deploy-catalog-files-to-support-code-integrity-policies.md)
+- [Deploy Managed Installer for Device Guard](deploy-managed-installer-for-device-guard.md)
To increase the protection for devices that meet certain hardware requirements, you can use virtualization-based security (VBS) with your code integrity policies.
- For requirements, see [Hardware, firmware, and software requirements for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md#hardware-firmware-and-software-requirements-for-device-guard) in "Requirements and deployment planning guidelines for Device Guard."
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
new file mode 100644
index 0000000000..b0f818ea94
--- /dev/null
+++ b/windows/device-security/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-device-security"
+ }
+}
\ No newline at end of file
diff --git a/windows/device-security/index.md b/windows/device-security/index.md
index 9a34a8d74f..dc7615e6f9 100644
--- a/windows/device-security/index.md
+++ b/windows/device-security/index.md
@@ -24,5 +24,3 @@ Learn more about how to help secure your Windows 10 and Windows 10 Mobile devi
| [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)| Provides links to information about the Trusted Platform Module (TPM), which is a secure crypto-processor that helps you with actions such as generating, storing, and limiting the use of cryptographic keys. |
| [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md) | Learn more about securing your Windows 10 Mobile devices. |
| [Windows security baselines](windows-security-baselines.md) | Learn why you should use security baselines in your organization. |
-
-
diff --git a/windows/WaaS-infographic.pdf b/windows/hub/WaaS-infographic.pdf
similarity index 100%
rename from windows/WaaS-infographic.pdf
rename to windows/hub/WaaS-infographic.pdf
diff --git a/windows/hub/breadcrumb/toc.yml b/windows/hub/breadcrumb/toc.yml
new file mode 100644
index 0000000000..c435a3c156
--- /dev/null
+++ b/windows/hub/breadcrumb/toc.yml
@@ -0,0 +1,32 @@
+- name: Docs
+ tocHref: /
+ topicHref: /
+ items:
+ - name: Windows
+ tocHref: /windows
+ topicHref: /windows/windows-10
+ items:
+ - name: What's new
+ tocHref: /windows/whats-new/
+ topicHref: /windows/whats-new/index
+ - name: Configuration
+ tocHref: /windows/configuration/
+ topicHref: /windows/configuration/index
+ - name: Deployment
+ tocHref: /windows/deployment/
+ topicHref: /windows/deployment/index
+ - name: Application management
+ tocHref: /windows/application-management/
+ topicHref: /windows/application-management/index
+ - name: Client management
+ tocHref: /windows/client-management/
+ topicHref: /windows/client-management/index
+ - name: Access protection
+ tocHref: /windows/access-protection/
+ topicHref: /windows/access-protection/index
+ - name: Device security
+ tocHref: /windows/device-security/
+ topicHref: /windows/device-security/index
+ - name: Threat protection
+ tocHref: /windows/threat-protection/
+ topicHref: /windows/threat-protection/index
\ No newline at end of file
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
new file mode 100644
index 0000000000..863fc12d71
--- /dev/null
+++ b/windows/hub/docfx.json
@@ -0,0 +1,43 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md",
+ "**/*.yml"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif",
+ "**/*.pdf"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "windows-hub"
+ }
+}
\ No newline at end of file
diff --git a/windows/hub/index.md b/windows/hub/index.md
index 5b45764b91..7ebbf52bf3 100644
--- a/windows/hub/index.md
+++ b/windows/hub/index.md
@@ -80,7 +80,7 @@ Find the latest how to and support content that IT pros need to evaluate, plan,
These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
- - Read more about Windows as a Service
+ - Read more about Windows as a Service
|
diff --git a/windows/keep-secure/docfx.json b/windows/keep-secure/docfx.json
new file mode 100644
index 0000000000..8d60cf1552
--- /dev/null
+++ b/windows/keep-secure/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "keep-secure"
+ }
+}
\ No newline at end of file
diff --git a/windows/manage/docfx.json b/windows/manage/docfx.json
new file mode 100644
index 0000000000..628f06503d
--- /dev/null
+++ b/windows/manage/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "windows-manage"
+ }
+}
\ No newline at end of file
diff --git a/windows/plan/docfx.json b/windows/plan/docfx.json
new file mode 100644
index 0000000000..289552ee34
--- /dev/null
+++ b/windows/plan/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "windows-plan"
+ }
+}
\ No newline at end of file
diff --git a/windows/threat-protection/change-history-for-threat-protection.md b/windows/threat-protection/change-history-for-threat-protection.md
index 5ada088112..94f62ff897 100644
--- a/windows/threat-protection/change-history-for-threat-protection.md
+++ b/windows/threat-protection/change-history-for-threat-protection.md
@@ -14,6 +14,7 @@ This topic lists new and updated topics in the [Threat protection](index.md) doc
## March 2017
|New or changed topic |Description |
|---------------------|------------|
+|[Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune.md)|Updated based on Windows 10, version 1703.|
|[How to collect Windows Information Protection (WIP) audit event logs](windows-information-protection\collect-wip-audit-event-logs.md) |New |
|[Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md) |Updated based on Windows 10, version 1703. |
|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md) |Updated based on Windows 10, version 1703. |
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
new file mode 100644
index 0000000000..5614b0a94c
--- /dev/null
+++ b/windows/threat-protection/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-threat-protection"
+ }
+}
\ No newline at end of file
diff --git a/windows/threat-protection/index.md b/windows/threat-protection/index.md
index e1b2bdd0e9..77a4201aad 100644
--- a/windows/threat-protection/index.md
+++ b/windows/threat-protection/index.md
@@ -22,4 +22,3 @@ Learn more about how to help protect against threats in Windows 10 and Windows
| [Windows Defender SmartScreen](windows-defender-smartscreen/windows-defender-smartscreen-overview.md) | Learn more about Windows Defender SmartScreen. |
| [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) | Learn about an approach to collect events from devices in your organization. This article talks about events in both normal operations and when an intrusion is suspected. |
| [Block untrusted fonts in an enterprise](block-untrusted-fonts-in-enterprise.md) | To help protect your company from attacks which may originate from untrusted or attacker controlled font files, we’ve created the Blocking Untrusted Fonts feature. Using this feature, you can turn on a global setting that stops your employees from loading untrusted fonts processed using the Graphics Device Interface (GDI) onto your network. Untrusted fonts are any font installed outside of the %windir%/Fonts directory. Blocking untrusted fonts helps prevent both remote (web-based or email-based) and local EOP attacks that can happen during the font file-parsing process. |
-
diff --git a/windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
index 07ea7f165f..311ebea501 100644
--- a/windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/preview-windows-defender-advanced-threat-protection.md
@@ -28,4 +28,7 @@ Learn about new features in the Windows Defender ATP preview release and be amon
You'll have access to upcoming features which you can provide feedback on to help improve the overall experience before features are generally available.
-For more information, see [Turn on the preview experience](preview-settings-windows-defender-advanced-threat-protection.md).
+Turn on the preview experience setting to be among the first to try upcoming features.
+
+1. In the navigation pane, select **Preferences setup** > **Preview experience**.
+2. Toggle the setting between **On** and **Off** and select **Save preferences**.
diff --git a/windows/threat-protection/windows-information-protection/app-behavior-with-wip.md b/windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
index d436e1e7a7..6f41240d2b 100644
--- a/windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
+++ b/windows/threat-protection/windows-information-protection/app-behavior-with-wip.md
@@ -14,7 +14,7 @@ localizationpriority: high
**Applies to:**
- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10 Mobile, version 1607 and later
Windows Information Protection (WIP) classifies apps into two categories: enlightened and unenlightened. Enlighted apps can differentiate between corporate and personal data, correctly determining which to protect based on internal policies. Corporate data is encrypted on the managed device and attempts to copy/paste or share this information with non-corporate apps or people will fail. Unenlightened apps, when marked as corporate-managed, consider all data corporate and encrypt everything by default.
diff --git a/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md b/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
index fed5d91fb9..9316b2ab60 100644
--- a/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
+++ b/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md
@@ -13,8 +13,8 @@ localizationpriority: high
**Applies to:**
-- Windows 10 and later
-- Windows 10 Mobile and later
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
Windows Information Protection (WIP) creates audit events in the following situations:
diff --git a/windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md b/windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
index ab2695ebf7..76d9d3a63c 100644
--- a/windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
+++ b/windows/threat-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
@@ -13,8 +13,8 @@ localizationpriority: high
# Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate
**Applies to:**
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
If you don’t already have an EFS DRA certificate, you’ll need to create and extract one from your system before you can use Windows Information Protection (WIP), formerly known as enterprise data protection (EDP), in your organization. For the purposes of this section, we’ll use the file name EFSDRA; however, this name can be replaced with anything that makes sense to you.
diff --git a/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
index a7f261c3e7..9fbe861ddc 100644
--- a/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
@@ -1,6 +1,6 @@
---
-title: Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune (Windows 10)
-description: After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to create and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
+title: Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune (Windows 10)
+description: After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
ms.assetid: d0eaba4f-6d7d-4ae4-8044-64680a40cf6b
keywords: WIP, Enterprise Data Protection
ms.prod: w10
@@ -11,103 +11,63 @@ author: eross-msft
localizationpriority: high
---
-# Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune
+# Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune
**Applies to:**
-- Windows 10, version 1607
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
-After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to create and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
+After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Azure Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
+
+## Associate your WIP policy to your VPN policy by using Microsoft Azure Intune
+Follow these steps to associate your WIP policy with your organization's existing VPN policy.
-## Create your VPN policy using Microsoft Intune
-Follow these steps to create the VPN policy you want to use with WIP.
+**To associate your policies**
-**To create your VPN policy**
+1. Create your VPN profile. For info about how to do this, see [How to configure VPN settings in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/how-to-configure-vpn-settings) and [How to create custom VPN profiles in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/create-custom-vpn-profiles#create-a-custom-configuration).
-1. Open the Intune administration console, and go to the **Policy** node, and then click **Add Policy**.
+2. Open the Microsoft Azure Intune mobile application management console, click **Device configuration**, and then click **Create Profile**.
-2. Go to **Windows**, click the **VPN Profile (Windows 10 Desktop and Mobile and later)**, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
+ 
- 
+3. In the **Create Profile** blade, type a name for your profile, such as *Contoso_VPN_Win10*, into the **Name** box, add an optional description for your policy into the **Description** box, select **Windows 10 and later** from the **Platform** dropdown box, select **Custom** from the **Profile type** dropdown box, and then click **Configure**.
-3. Type *Contoso_VPN_Win10* into the **Name** box, along with an optional description for your policy into the **Description** box.
+ 
- 
+4. In the **Custom OMA-URI Settings** blade, click **Add**.
-4. In the **VPN Settings** area, type the following info:
+5. In the **Add Row** blade, type:
- - **VPN connection name.** This name is also what appears to your employees, so it's important that it be clear and understandable.
+ - **Name.** Type a name for your setting, such as *EDPModeID*.
+
+ - **Description.** Type an optional description for your setting.
+
+ - **OMA-URI.** Type _./Vendor/MSFT/VPNv2/<VPNProfileName>/EDPModeId_ into the box.
- - **Connection type.** Pick the connection type that matches your infrastructure. The options are **Pulse Secure**, **F5 Edge Client**, **Dell SonicWALL Mobile Connect**, or **Check Point Capsule VPN**.
+ - **Data type.** Select **String** from the dropdown box
+
+ - **Value.** Type your fully-qualified domain that should be used by the OMA-URI setting. For example, _corp.contoso.com_.
- - **VPN server description.** A descriptive name for this connection. Only you will see it, but it should be unique and readable.
+ 
- - **Server IP address or FQDN.** The server's IP address or fully-qualified domain name (FQDN).
+6. Click **OK** to save your setting info in the **Add Row** blade, and then click **OK** in the **Custom OMA-URI Settings** blade to save the setting with your policy.
- 
+7. Click **Create** to create the policy, including your OMA_URI info.
-5. In the **Authentication** area, choose the authentication method that matches your VPN infrastructure, either **Username and Password** or **Certificates**.
-It's your choice whether you check the box to **Remember the user credentials at each logon**.
-
- 
-
-6. You can leave the rest of the default or blank settings, and then click **Save Policy**.
-
-## Deploy your VPN policy using Microsoft Intune
+## Deploy your VPN policy using Microsoft Azure Intune
After you’ve created your VPN policy, you'll need to deploy it to the same group you deployed your Windows Information Protection (WIP) policy.
-**To deploy your VPN policy**
+**To deploy your Custom VPN policy**
-1. On the **Configuration policies** page, locate your newly-created policy, click to select it, and then click the **Manage Deployment** button.
+1. On the **App policy** blade, click your newly-created policy, click **User groups** from the menu that appears, and then click **Add user group**.
-2. In the left pane of the **Manage Deployment** box, click the employees or groups that should get the policy, and then click **Add**.
-The added people move to the **Selected Groups** list on the right-hand pane.
+ A list of user groups, made up of all of the security groups in your Azure Active Directory, appear in the **Add user group** blade.
- 
+2. Choose the group you want your policy to apply to, and then click **Select** to deploy the policy.
-3. After you've picked all of the employees and groups that should get the policy, click **OK**.
-The policy is deployed to the selected users' devices.
+ The policy is deployed to the selected users' devices.
-## Link your WIP and VPN policies and deploy the custom configuration policy
-The final step to making your VPN configuration work with WIP, is to link your two policies together. To do this, you must first create a custom configuration policy, setting it to use your **EDPModeID** setting, and then deploying the policy to the same group you deployed your WIP and VPN policies
-
-**To link your VPN policy**
-
-1. Open the Intune administration console, and go to the **Policy** node, and then click **Add Policy**.
-
-2. Go to **Windows**, click the **Custom Configuration (Windows 10 Desktop and Mobile and later)**, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.
-
- 
-
-3. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
-
- 
-
-4. In the **OMA-URI Settings** area, click **Add** to add your **EDPModeID** info.
-
-5. In the **OMA-URI Settings** area, type the following info:
-
- - **Setting name.** Type **EDPModeID** as the name.
-
- - **Data type.** Pick the **String** data type.
-
- - **OMA-URI.** Type `./Vendor/MSFT/VPNv2//EDPModeId`, replacing <*VPNProfileName*> with the name you gave to your VPN policy. For example, `./Vendor/MSFT/VPNv2/W10-Checkpoint-VPN1/EDPModeId`.
-
- - **Value.** Your fully-qualified domain that should be used by the OMA-URI setting.
-
- 
-
-6. Click **OK** to save your new OMA-URI setting, and then click **Save Policy.**
-
- **To deploy your linked policy**
-
-1. On the **Configuration policies** page, locate your newly-created policy, click to select it, and then click the **Manage Deployment** button.
-
-2. In the left pane of the **Manage Deployment** box, click the employees or groups that should get the policy, and then click **Add**. The added people move to the **Selected Groups** list on the right-hand pane.
-
- 
-
-3. After you've picked all of the employees and groups that should get the policy, click **OK**. The policy is deployed to the selected users' devices.
+ 
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
index 87beae20a0..cb3d8f028e 100644
--- a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
@@ -412,12 +412,12 @@ There are no default locations included with WIP, you must add each of your netw
| Proxy servers |
proxy.contoso.com:80;proxy2.contoso.com:443 |
- Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Internal proxy servers list, which are used for non-WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
+ Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
| Internal proxy servers |
contoso.internalproxy1.com;contoso.internalproxy2.com |
- Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in the Proxy servers list, which are used for WIP-protected traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
+ Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
| IPv4 ranges |
@@ -506,7 +506,7 @@ Optionally, if you don’t want everyone in your organization to be able to shar
## Related topics
- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
-- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
+- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
- [Azure RMS Documentation Update for May 2016](https://blogs.technet.microsoft.com/enterprisemobility/2016/05/31/azure-rms-documentation-update-for-may-2016/)
- [What is Azure Rights Management?]( https://docs.microsoft.com/en-us/information-protection/understand-explore/what-is-azure-rms)
diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
index 91b8f3df68..828d6becd9 100644
--- a/windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-sccm.md
@@ -14,9 +14,9 @@ localizationpriority: high
# Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager
**Applies to:**
-- Windows 10, version 1607
-- Windows 10 Mobile
-- System Center Configuration Manager
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
+- System Center Configuration Manager
System Center Configuration Manager helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection mode, and how to find enterprise data on the network.
@@ -387,7 +387,7 @@ There are no default locations included with WIP, you must add each of your netw
| Enterprise Cloud Resources |
With proxy: contoso.sharepoint.com,contoso.internalproxy1.com|
contoso.visualstudio.com,contoso.internalproxy2.comWithout proxy: contoso.sharepoint.com|contoso.visualstudio.com |
- Specify the cloud resources to be treated as corporate and protected by WIP. For each cloud resource, you may also optionally specify a proxy server from your Enterprise Internal Proxy Servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Enterprise Internal Proxy Servers is considered enterprise. If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: URL <,proxy>|URL <,proxy>. Important
In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/. |
+ Specify the cloud resources to be treated as corporate and protected by WIP. For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise. If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: URL <,proxy>|URL <,proxy>. Important
In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/. |
| Enterprise Network Domain Names (Required) |
@@ -395,14 +395,14 @@ There are no default locations included with WIP, you must add each of your netw
Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected. This setting works with the IP ranges settings to detect whether a network endpoint is enterprise or personal on private networks. If you have multiple resources, you must separate them using the "," delimiter. |
- | Enterprise Proxy Servers |
+ Proxy servers |
proxy.contoso.com:80;proxy2.contoso.com:443 |
- Specify your externally-facing proxy server addresses, along with the port through which traffic is allowed and protected with WIP. This list shouldn’t include any servers listed in the Enterprise Internal Proxy Servers list, which are used for WIP-protected traffic. This setting is also required if you use a proxy in your network. If you don't have a proxy server, you might find that enterprise resources are unavailable when a client is behind a proxy, such as when you’re visiting another company and not on that company’s guest network. If you have multiple resources, you must separate them using the ";" delimiter. |
+ Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
- | Enterprise Internal Proxy Servers |
+ Internal proxy servers |
contoso.internalproxy1.com;contoso.internalproxy2.com |
- Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources. This list shouldn’t include any servers listed in the Enterprise Proxy Servers list, which are used for non-WIP-protected traffic. If you have multiple resources, you must separate them using the ";" delimiter. |
+ Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.
This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
| Enterprise IPv4 Range (Required) |
diff --git a/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
index 1f45e69882..486fadd600 100644
--- a/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/deploy-wip-policy-using-intune.md
@@ -38,6 +38,6 @@ After you’ve created your Windows Information Protection (WIP) policy, you'll
## Related topics
- [Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune](create-wip-policy-using-intune.md)
-- [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
+- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
diff --git a/windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md b/windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
index 5555cd3892..77df2d4e51 100644
--- a/windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
+++ b/windows/threat-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
@@ -15,8 +15,8 @@ localizationpriority: high
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
Learn the difference between enlightened and unenlightened apps, and then review the list of enlightened apps provided by Microsoft along with the text you will need to use to add them to your allowed apps list.
diff --git a/windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md b/windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
index a0cabb4a95..af85cdebaf 100644
--- a/windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
+++ b/windows/threat-protection/windows-information-protection/guidance-and-best-practices-wip.md
@@ -14,8 +14,8 @@ localizationpriority: high
# General guidance and best practices for Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
This section includes info about the enlightened Microsoft apps, including how to add them to your allowed apps list in Microsoft Intune. It also includes some testing scenarios that we recommend running through with Windows Information Protection (WIP).
diff --git a/windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md b/windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
index 096d363084..d4b9837475 100644
--- a/windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
+++ b/windows/threat-protection/windows-information-protection/mandatory-settings-for-wip.md
@@ -13,8 +13,8 @@ localizationpriority: high
# Mandatory tasks and settings required to turn on Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
This list provides all of the tasks and settings that are required for the operating system to turn on Windows Information Protection (WIP), formerly known as enterprise data protection (EDP), in your enterprise.
diff --git a/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md b/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
index b2b23e5275..eb659e55c3 100644
--- a/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
+++ b/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md
@@ -13,8 +13,8 @@ localizationpriority: high
# Create a Windows Information Protection (WIP) policy
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
Microsoft Intune and System Center Configuration Manager helps you create and deploy your enterprise data protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
diff --git a/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md b/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
index 534d29dde5..896d97f4a0 100644
--- a/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
+++ b/windows/threat-protection/windows-information-protection/protect-enterprise-data-using-wip.md
@@ -14,8 +14,8 @@ localizationpriority: high
# Protect your enterprise data using Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1703
-- Windows 10 Mobile, version 1703
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
diff --git a/windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md b/windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
index ca34c042a9..0d5eb4ca6f 100644
--- a/windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
+++ b/windows/threat-protection/windows-information-protection/recommended-network-definitions-for-wip.md
@@ -14,8 +14,8 @@ localizationpriority: high
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
diff --git a/windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md b/windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
index a2d5c9f975..a46e4231ad 100644
--- a/windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
+++ b/windows/threat-protection/windows-information-protection/testing-scenarios-for-wip.md
@@ -14,8 +14,8 @@ localizationpriority: high
# Testing scenarios for Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
We've come up with a list of suggested testing scenarios that you can use to test Windows Information Protection (WIP) in your company.
diff --git a/windows/threat-protection/windows-information-protection/using-owa-with-wip.md b/windows/threat-protection/windows-information-protection/using-owa-with-wip.md
index eaf4299596..d60d0bf4ad 100644
--- a/windows/threat-protection/windows-information-protection/using-owa-with-wip.md
+++ b/windows/threat-protection/windows-information-protection/using-owa-with-wip.md
@@ -13,8 +13,8 @@ localizationpriority: high
# Using Outlook on the web with Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
diff --git a/windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md b/windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
index 107cfa5c1f..c3c1f07f56 100644
--- a/windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
+++ b/windows/threat-protection/windows-information-protection/wip-app-enterprise-context.md
@@ -13,8 +13,8 @@ localizationpriority: high
# Determine the Enterprise Context of an app running in Windows Information Protection (WIP)
**Applies to:**
-- Windows 10, version 1607 and later
-- Windows 10 Mobile
+- Windows 10, version 1607 and later
+- Windows 10 Mobile, version 1607 and later
>Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
diff --git a/windows/update/docfx.json b/windows/update/docfx.json
new file mode 100644
index 0000000000..21e6f12fb6
--- /dev/null
+++ b/windows/update/docfx.json
@@ -0,0 +1,37 @@
+{
+ "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": "windows-update"
+ }
+}
\ No newline at end of file
diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json
new file mode 100644
index 0000000000..f2cd5d5e8b
--- /dev/null
+++ b/windows/whats-new/docfx.json
@@ -0,0 +1,41 @@
+{
+ "build": {
+ "content": [
+ {
+ "files": [
+ "**/*.md"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**",
+ "README.md",
+ "LICENSE",
+ "LICENSE-CODE",
+ "ThirdPartyNotices"
+ ]
+ }
+ ],
+ "resource": [
+ {
+ "files": [
+ "**/*.png",
+ "**/*.jpg",
+ "**/*.gif"
+ ],
+ "exclude": [
+ "**/obj/**",
+ "**/includes/**"
+ ]
+ }
+ ],
+ "overwrite": [],
+ "externalReference": [],
+ "globalMetadata": {
+ "uhfHeaderId": "MSDocsHeader-WindowsIT",
+ "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+ },
+ "fileMetadata": {},
+ "template": [],
+ "dest": "win-whats-new"
+ }
+}
\ No newline at end of file
diff --git a/windows/whats-new/whats-new-windows-10-version-1703.md b/windows/whats-new/whats-new-windows-10-version-1703.md
index ca67f10139..901e7a0a0c 100644
--- a/windows/whats-new/whats-new-windows-10-version-1703.md
+++ b/windows/whats-new/whats-new-windows-10-version-1703.md
@@ -75,7 +75,7 @@ Cortana is Microsoft’s personal digital assistant, who helps busy people get t
Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data.
-For more info about Cortana at work, see (/windows/configuration/cortana-at-work/cortana-at-work-overview)
+For more info about Cortana at work, see [Cortana integration in your business or enterprise](/windows/configuration/cortana-at-work/cortana-at-work-overview.md)
## Deployment
@@ -170,6 +170,11 @@ For Windows desktops, users are able to reset a forgotten PIN through **Settings
For more details, check out [What if I forget my PIN?](/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password#what-if-i-forget-my-pin).
+### Windows Information Protection (WIP) and Azure Active Directory (Azure AD)
+Microsoft Azure Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your allowed apps, your WIP-protection level, and how to find enterprise data on the network. For more info, see [Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune](/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md) and [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md).
+
+You can also now collect your audit event logs by using the Reporting configuration service provider (CSP) or the Windows Event Forwarding (for Windows desktop domain-joined devices). For info, see the brand-new topic, [How to collect Windows Information Protection (WIP) audit event logs](/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs.md).
+
## Update
### Windows Update for Business
|
](../images/UR-lift-report.jpg){kind=link}