diff --git a/devices/hololens/change-history-hololens.md b/devices/hololens/change-history-hololens.md
index 312d0a523b..68f9c695ce 100644
--- a/devices/hololens/change-history-hololens.md
+++ b/devices/hololens/change-history-hololens.md
@@ -2,10 +2,9 @@
title: Change history for Microsoft HoloLens documentation
description: This topic lists new and updated topics for HoloLens.
keywords: change history
-ms.prod: w10
+ms.prod: hololens
ms.mktglfcycl: manage
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/hololens/hololens-encryption.md b/devices/hololens/hololens-encryption.md
index c600771609..8210e1f2fb 100644
--- a/devices/hololens/hololens-encryption.md
+++ b/devices/hololens/hololens-encryption.md
@@ -1,9 +1,8 @@
---
title: Enable Bitlocker encryption for HoloLens (HoloLens)
description: Enable Bitlocker device encryption to protect files stored on the HoloLens
-ms.prod: w10
+ms.prod: hololens
ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-enroll-mdm.md b/devices/hololens/hololens-enroll-mdm.md
index fde1f15636..5f79d72c2e 100644
--- a/devices/hololens/hololens-enroll-mdm.md
+++ b/devices/hololens/hololens-enroll-mdm.md
@@ -1,9 +1,8 @@
---
title: Enroll HoloLens in MDM (HoloLens)
description: Enroll HoloLens in mobile device management (MDM) for easier management of multiple devices.
-ms.prod: w10
+ms.prod: hololens
ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-install-apps.md b/devices/hololens/hololens-install-apps.md
index d33b78b2a9..3de34452cf 100644
--- a/devices/hololens/hololens-install-apps.md
+++ b/devices/hololens/hololens-install-apps.md
@@ -1,9 +1,8 @@
---
title: Install apps on HoloLens (HoloLens)
description: The recommended way to install apps on HoloLens is to use Microsoft Store for Business.
-ms.prod: w10
+ms.prod: hololens
ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-kiosk.md b/devices/hololens/hololens-kiosk.md
index d1be189b4b..0abcc7ac79 100644
--- a/devices/hololens/hololens-kiosk.md
+++ b/devices/hololens/hololens-kiosk.md
@@ -1,9 +1,7 @@
---
title: Set up HoloLens in kiosk mode (HoloLens)
description: Use a kiosk configuration to lock down the apps on HoloLens.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-microsoft-layout-app.md b/devices/hololens/hololens-microsoft-layout-app.md
index 6e782af99f..d2357ed2ee 100644
--- a/devices/hololens/hololens-microsoft-layout-app.md
+++ b/devices/hololens/hololens-microsoft-layout-app.md
@@ -1,9 +1,7 @@
---
title: Microsoft Layout
description: How to get and deploy the Microsoft Layout app throughout your organization
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: alhopper-msft
ms.author: alhopper
diff --git a/devices/hololens/hololens-microsoft-remote-assist-app.md b/devices/hololens/hololens-microsoft-remote-assist-app.md
index cea23cde18..221c650ada 100644
--- a/devices/hololens/hololens-microsoft-remote-assist-app.md
+++ b/devices/hololens/hololens-microsoft-remote-assist-app.md
@@ -1,9 +1,7 @@
---
title: Microsoft Remote Assist
description: How to get and deploy the Microsoft Remote Assist app throughout your organization
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: alhopper-msft
ms.author: alhopper
diff --git a/devices/hololens/hololens-multiple-users.md b/devices/hololens/hololens-multiple-users.md
index 2f75216d91..f5bbdf30af 100644
--- a/devices/hololens/hololens-multiple-users.md
+++ b/devices/hololens/hololens-multiple-users.md
@@ -1,9 +1,7 @@
---
title: Share HoloLens with multiple people (HoloLens)
description: You can configure HoloLens to be shared by multiple Azure Active Directory accounts.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-provisioning.md b/devices/hololens/hololens-provisioning.md
index 3db745d872..86631b4976 100644
--- a/devices/hololens/hololens-provisioning.md
+++ b/devices/hololens/hololens-provisioning.md
@@ -1,9 +1,7 @@
---
title: Configure HoloLens using a provisioning package (HoloLens)
description: Windows provisioning makes it easy for IT administrators to configure end-user devices without imaging.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-public-preview-apps.md b/devices/hololens/hololens-public-preview-apps.md
index dc61a8e6e2..e3a966f008 100644
--- a/devices/hololens/hololens-public-preview-apps.md
+++ b/devices/hololens/hololens-public-preview-apps.md
@@ -1,9 +1,7 @@
---
title: Preview new mixed reality apps for HoloLens
description: Here's how to download and distribute new mixed reality apps for HoloLens, free for a limited time during public preview
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: alhopper
ms.author: alhopper
diff --git a/devices/hololens/hololens-requirements.md b/devices/hololens/hololens-requirements.md
index 7120c2c082..402cb33a40 100644
--- a/devices/hololens/hololens-requirements.md
+++ b/devices/hololens/hololens-requirements.md
@@ -1,9 +1,7 @@
---
title: HoloLens in the enterprise requirements and FAQ (HoloLens)
description: Requirements and FAQ for general use, Wi-Fi, and device management for HoloLens in the enterprise.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-setup.md b/devices/hololens/hololens-setup.md
index 513cc01e01..8850ba0f96 100644
--- a/devices/hololens/hololens-setup.md
+++ b/devices/hololens/hololens-setup.md
@@ -1,9 +1,7 @@
---
title: Set up HoloLens (HoloLens)
description: The first time you set up HoloLens, you'll need a Wi-Fi network and either a Microsoft or Azure Active Directory account.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-updates.md b/devices/hololens/hololens-updates.md
index db02ac16fe..0b91b6f361 100644
--- a/devices/hololens/hololens-updates.md
+++ b/devices/hololens/hololens-updates.md
@@ -1,9 +1,7 @@
---
title: Manage updates to HoloLens (HoloLens)
description: Administrators can use mobile device management to manage updates to HoloLens devices.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-upgrade-enterprise.md b/devices/hololens/hololens-upgrade-enterprise.md
index 8af44caabc..b855080450 100644
--- a/devices/hololens/hololens-upgrade-enterprise.md
+++ b/devices/hololens/hololens-upgrade-enterprise.md
@@ -1,9 +1,7 @@
---
title: Unlock Windows Holographic for Business features (HoloLens)
description: HoloLens provides extra features designed for business when you upgrade to Windows Holographic for Business.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/hololens-whats-new.md b/devices/hololens/hololens-whats-new.md
index 9fd9e4d5de..75556a83db 100644
--- a/devices/hololens/hololens-whats-new.md
+++ b/devices/hololens/hololens-whats-new.md
@@ -1,9 +1,7 @@
---
title: What's new in Microsoft HoloLens (HoloLens)
description: Windows Holographic for Business gets new features in Windows 10, version 1803.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/hololens/index.md b/devices/hololens/index.md
index 3ec29c73a2..90e76edb5e 100644
--- a/devices/hololens/index.md
+++ b/devices/hololens/index.md
@@ -1,9 +1,7 @@
---
title: Microsoft HoloLens (HoloLens)
description: HoloLens provides extra features designed for business in the Commercial Suite.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: hololens, devices
+ms.prod: hololens
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/surface-hub/accessibility-surface-hub.md b/devices/surface-hub/accessibility-surface-hub.md
index 3fbf1e269e..618afe96b7 100644
--- a/devices/surface-hub/accessibility-surface-hub.md
+++ b/devices/surface-hub/accessibility-surface-hub.md
@@ -3,9 +3,7 @@ title: Accessibility (Surface Hub)
description: Accessibility settings for the Microsoft Surface Hub can be changed by using the Settings app. You'll find them under Ease of Access. Your Surface Hub has the same accessibility options as Windows 10.
ms.assetid: 1D44723B-1162-4DF6-99A2-8A3F24443442
keywords: Accessibility settings, Settings app, Ease of Access
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: surfacehub
+ms.prod: surface-hub
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/surface-hub/admin-group-management-for-surface-hub.md b/devices/surface-hub/admin-group-management-for-surface-hub.md
index 2803f47304..5771b3f3c5 100644
--- a/devices/surface-hub/admin-group-management-for-surface-hub.md
+++ b/devices/surface-hub/admin-group-management-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Admin group management (Surface Hub)
description: Every Microsoft Surface Hub can be configured individually by opening the Settings app on the device.
ms.assetid: FA67209E-B355-4333-B903-482C4A3BDCCE
keywords: admin group management, Settings app, configure Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
index 36df6680a5..7dafdcf898 100644
--- a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
+++ b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
@@ -3,10 +3,8 @@ title: PowerShell for Surface Hub (Surface Hub)
description: PowerShell scripts to help set up and manage your Microsoft Surface Hub.
ms.assetid: 3EF48F63-8E4C-4D74-ACD5-461F1C653784
keywords: PowerShell, set up Surface Hub, manage Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
index cd10c695db..f34a48b0b7 100644
--- a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: Applying ActiveSync policies to device accounts (Surface Hub)
description: The Microsoft Surface Hub's device account uses ActiveSync to sync mail and calendar. This allows people to join and start scheduled meetings from the Surface Hub, and allows them to email any whiteboards they have made during their meeting.
ms.assetid: FAABBA74-3088-4275-B58E-EC1070F4D110
keywords: Surface Hub, ActiveSync policies
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/change-history-surface-hub.md b/devices/surface-hub/change-history-surface-hub.md
index 3d35042b08..1a7df44a44 100644
--- a/devices/surface-hub/change-history-surface-hub.md
+++ b/devices/surface-hub/change-history-surface-hub.md
@@ -2,10 +2,8 @@
title: Change history for Surface Hub
description: This topic lists new and updated topics for Surface Hub.
keywords: change history
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/change-surface-hub-device-account.md b/devices/surface-hub/change-surface-hub-device-account.md
index 9e7f3c004d..bef2ff6610 100644
--- a/devices/surface-hub/change-surface-hub-device-account.md
+++ b/devices/surface-hub/change-surface-hub-device-account.md
@@ -3,10 +3,8 @@ title: Change the Microsoft Surface Hub device account
description: You can change the device account in Settings to either add an account if one was not already provisioned, or to change any properties of an account that was already provisioned.
ms.assetid: AFC43043-3319-44BC-9310-29B1F375E672
keywords: change device account, change properties, Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/connect-and-display-with-surface-hub.md b/devices/surface-hub/connect-and-display-with-surface-hub.md
index 225d3e235a..4a5167db40 100644
--- a/devices/surface-hub/connect-and-display-with-surface-hub.md
+++ b/devices/surface-hub/connect-and-display-with-surface-hub.md
@@ -2,10 +2,8 @@
title: Connect other devices and display with Surface Hub
description: You can connect other device to your Surface Hub to display content.
ms.assetid: 8BB80FA3-D364-4A90-B72B-65F0F0FC1F0D
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/create-a-device-account-using-office-365.md b/devices/surface-hub/create-a-device-account-using-office-365.md
index cc1d0ec9cd..6b6492acc1 100644
--- a/devices/surface-hub/create-a-device-account-using-office-365.md
+++ b/devices/surface-hub/create-a-device-account-using-office-365.md
@@ -3,10 +3,8 @@ title: Create a device account using UI (Surface Hub)
description: If you prefer to use a graphical user interface, you can create a device account for your Microsoft Surface Hub with either the Office 365 UI or the Exchange Admin Center.
ms.assetid: D11BCDC4-DABA-4B9A-9ECB-58E02CC8218C
keywords: create device account, Office 365 UI, Exchange Admin center, Office 365 admin center, Skype for Business, mobile device mailbox policy
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
index cc60ff723c..3895e5aea7 100644
--- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
+++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
@@ -3,10 +3,8 @@ title: Create and test a device account (Surface Hub)
description: This topic introduces how to create and test the device account that Microsoft Surface Hub uses to communicate with Microsoft Exchange and Skype.
ms.assetid: C8605B5F-2178-4C3A-B4E0-CE32C70ECF67
keywords: create and test device account, device account, Surface Hub and Microsoft Exchange, Surface Hub and Skype
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md
index 281dc1b880..b4ee4473f6 100644
--- a/devices/surface-hub/device-reset-surface-hub.md
+++ b/devices/surface-hub/device-reset-surface-hub.md
@@ -3,10 +3,8 @@ title: Device reset (Surface Hub)
description: You may wish to reset your Microsoft Surface Hub.
ms.assetid: 44E82EEE-1905-464B-A758-C2A1463909FF
keywords: reset Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md b/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
index 40c7b012de..ae478d22b4 100644
--- a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
+++ b/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
@@ -2,10 +2,8 @@
title: Differences between Surface Hub and Windows 10 Enterprise
description: This topic explains the differences between Windows 10 Team and Windows 10 Enterprise.
keywords: change history
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: isaiahng
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/enable-8021x-wired-authentication.md b/devices/surface-hub/enable-8021x-wired-authentication.md
index ff69e90418..8407392860 100644
--- a/devices/surface-hub/enable-8021x-wired-authentication.md
+++ b/devices/surface-hub/enable-8021x-wired-authentication.md
@@ -1,10 +1,8 @@
---
title: Enable 802.1x wired authentication
description: 802.1x Wired Authentication MDM policies have been enabled on Surface Hub devices.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
index 40f93af750..2975a20db0 100644
--- a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: Microsoft Exchange properties (Surface Hub)
description: Some Microsoft Exchange properties of the device account must be set to particular values to have the best meeting experience on Microsoft Surface Hub.
ms.assetid: 3E84393B-C425-45BF-95A6-D6502BA1BF29
keywords: Microsoft Exchange properties, device account, Surface Hub, Windows PowerShell cmdlet
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/finishing-your-surface-hub-meeting.md b/devices/surface-hub/finishing-your-surface-hub-meeting.md
index bfc104fa22..c56335e042 100644
--- a/devices/surface-hub/finishing-your-surface-hub-meeting.md
+++ b/devices/surface-hub/finishing-your-surface-hub-meeting.md
@@ -2,10 +2,8 @@
title: End session - ending a Surface Hub meeting
description: To end a Surface Hub meeting, tap End session. Surface Hub cleans up the application state, operating system state, and the user interface so that Surface Hub is ready for the next meeting.
keywords: I am Done, end Surface Hub meeting, finish Surface Hub meeting, clean up Surface Hub meeting
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/first-run-program-surface-hub.md b/devices/surface-hub/first-run-program-surface-hub.md
index d488122210..2574c2cbf6 100644
--- a/devices/surface-hub/first-run-program-surface-hub.md
+++ b/devices/surface-hub/first-run-program-surface-hub.md
@@ -3,10 +3,8 @@ title: First-run program (Surface Hub)
description: The term \ 0034;first run \ 0034; refers to the series of steps you'll go through the first time you power up your Microsoft Surface Hub, and means the same thing as \ 0034;out-of-box experience \ 0034; (OOBE). This section will walk you through the process.
ms.assetid: 07C9E84C-1245-4511-B3B3-75939AD57C49
keywords: first run, Surface Hub, out-of-box experience, OOBE
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
index eabfb6c6cd..e0111f0b35 100644
--- a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: Hybrid deployment (Surface Hub)
description: A hybrid deployment requires special processing to set up a device account for your Microsoft Surface Hub.
ms.assetid: 7BFBB7BE-F587-422E-9CE4-C9DDF829E4F1
keywords: hybrid deployment, device account for Surface Hub, Exchange hosted on-prem, Exchange hosted online
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/index.md b/devices/surface-hub/index.md
index e966b4a42f..b819e54b9a 100644
--- a/devices/surface-hub/index.md
+++ b/devices/surface-hub/index.md
@@ -2,10 +2,8 @@
title: Microsoft Surface Hub admin guide
description: Documents related to the Microsoft Surface Hub.
ms.assetid: 69C99E91-1441-4318-BCAF-FE8207420555
-ms.prod: w10
-ms.mktglfcycl: explore
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md
index 69f12c9881..ffa77e640e 100644
--- a/devices/surface-hub/install-apps-on-surface-hub.md
+++ b/devices/surface-hub/install-apps-on-surface-hub.md
@@ -3,10 +3,8 @@ title: Install apps on your Microsoft Surface Hub
description: Admins can install apps can from either the Microsoft Store or the Microsoft Store for Business.
ms.assetid: 3885CB45-D496-4424-8533-C9E3D0EDFD94
keywords: install apps, Microsoft Store, Microsoft Store for Business
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, store
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/local-management-surface-hub-settings.md b/devices/surface-hub/local-management-surface-hub-settings.md
index 9bff610bcf..b53d27448f 100644
--- a/devices/surface-hub/local-management-surface-hub-settings.md
+++ b/devices/surface-hub/local-management-surface-hub-settings.md
@@ -2,10 +2,8 @@
title: Local management Surface Hub settings
description: How to manage Surface Hub settings with Settings.
keywords: manage Surface Hub, Surface Hub settings
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
index a21025c060..13af52d485 100644
--- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
+++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Manage settings with an MDM provider (Surface Hub)
description: Microsoft Surface Hub provides an enterprise management solution to help IT administrators manage policies and business applications on these devices using a mobile device management (MDM) solution.
ms.assetid: 18EB8464-6E22-479D-B0C3-21C4ADD168FE
keywords: mobile device management, MDM, manage policies
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, mobility
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/manage-surface-hub-settings.md b/devices/surface-hub/manage-surface-hub-settings.md
index a4a53440fb..ac7d714624 100644
--- a/devices/surface-hub/manage-surface-hub-settings.md
+++ b/devices/surface-hub/manage-surface-hub-settings.md
@@ -2,10 +2,8 @@
title: Manage Surface Hub settings
description: This section lists topics for managing Surface Hub settings.
keywords: Surface Hub accessibility settings, device account, device reset, windows updates, wireless network management
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/manage-surface-hub.md b/devices/surface-hub/manage-surface-hub.md
index 47c62571ef..9518232b8b 100644
--- a/devices/surface-hub/manage-surface-hub.md
+++ b/devices/surface-hub/manage-surface-hub.md
@@ -3,10 +3,8 @@ title: Manage Microsoft Surface Hub
description: How to manage your Surface Hub after finishing the first-run program.
ms.assetid: FDB6182C-1211-4A92-A930-6C106BCD5DC1
keywords: manage Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/manage-windows-updates-for-surface-hub.md b/devices/surface-hub/manage-windows-updates-for-surface-hub.md
index d3e78f1ff7..c769840d86 100644
--- a/devices/surface-hub/manage-windows-updates-for-surface-hub.md
+++ b/devices/surface-hub/manage-windows-updates-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Windows updates (Surface Hub)
description: You can manage Windows updates on your Microsoft Surface Hub by setting the maintenance window, deferring updates, or using Windows Server Update Services (WSUS).
ms.assetid: A737BD50-2D36-4DE5-A604-55053D549045
keywords: manage Windows updates, Surface Hub, Windows Server Update Services, WSUS
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
@@ -132,6 +130,11 @@ A default maintenance window is set for all new Surface Hubs:
To change the maintenance window using MDM, set the **MOMAgent** node in the [SurfaceHub configuration service provider](https://msdn.microsoft.com/library/windows/hardware/mt608323.aspx). See [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md) for more details.
+## More information
+
+- [Blog post: Servicing, Flighting, and Managing updates for Surface Hub (With Intune, of course!)](https://blogs.technet.microsoft.com/y0av/2018/05/31/7-3/)
+
+
## Related topics
[Manage Microsoft Surface Hub](manage-surface-hub.md)
diff --git a/devices/surface-hub/miracast-over-infrastructure.md b/devices/surface-hub/miracast-over-infrastructure.md
index a6a44e2d03..fb81f8e16d 100644
--- a/devices/surface-hub/miracast-over-infrastructure.md
+++ b/devices/surface-hub/miracast-over-infrastructure.md
@@ -1,10 +1,8 @@
---
title: Miracast on existing wireless network or LAN
description: Windows 10 enables you to send a Miracast stream over a local network.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/miracast-troubleshooting.md b/devices/surface-hub/miracast-troubleshooting.md
index 3c6c085881..6f3bdf62ec 100644
--- a/devices/surface-hub/miracast-troubleshooting.md
+++ b/devices/surface-hub/miracast-troubleshooting.md
@@ -1,10 +1,8 @@
---
title: Troubleshoot Miracast on Surface Hub
description: Learn how to resolve issues with Miracast on Surface Hub.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/monitor-surface-hub.md b/devices/surface-hub/monitor-surface-hub.md
index 6b10bdc4c5..ac60abe27d 100644
--- a/devices/surface-hub/monitor-surface-hub.md
+++ b/devices/surface-hub/monitor-surface-hub.md
@@ -3,10 +3,8 @@ title: Monitor your Microsoft Surface Hub
description: Monitoring for Microsoft Surface Hub devices is enabled through Microsoft Operations Management Suite (OMS).
ms.assetid: 1D2ED317-DFD9-423D-B525-B16C2B9D6942
keywords: monitor Surface Hub, Microsoft Operations Management Suite, OMS
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
index aadc1fa22e..15d5c2746e 100644
--- a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: On-premises deployment single forest (Surface Hub)
description: This topic explains how you add a device account for your Microsoft Surface Hub when you have a single-forest, on-premises deployment.
ms.assetid: 80E12195-A65B-42D1-8B84-ECC3FCBAAFC6
keywords: single forest deployment, on prem deployment, device account, Surface Hub
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.date: 06/01/2018
diff --git a/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md b/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
index 3c92823a8b..b367367025 100644
--- a/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
+++ b/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
@@ -2,10 +2,8 @@
title: On-premises deployment multi-forest (Surface Hub)
description: This topic explains how you add a device account for your Microsoft Surface Hub when you have a multi-forest, on-premises deployment.
keywords: multi forest deployment, on prem deployment, device account, Surface Hub
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.date: 06/01/2018
diff --git a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
index c253d82d11..d5c567a57f 100644
--- a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: Online deployment with Office 365 (Surface Hub)
description: This topic has instructions for adding a device account for your Microsoft Surface Hub when you have a pure, online deployment.
ms.assetid: D325CA68-A03F-43DF-8520-EACF7C3EDEC1
keywords: device account for Surface Hub, online deployment
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
index c17507564e..be86720a3a 100644
--- a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
@@ -3,10 +3,8 @@ title: Password management (Surface Hub)
description: Every Microsoft Surface Hub device account requires a password to authenticate and enable features on the device.
ms.assetid: 0FBFB546-05F0-430E-905E-87111046E4B8
keywords: password, password management, password rotation, device account
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/physically-install-your-surface-hub-device.md b/devices/surface-hub/physically-install-your-surface-hub-device.md
index fb4c19723b..f750d07a4f 100644
--- a/devices/surface-hub/physically-install-your-surface-hub-device.md
+++ b/devices/surface-hub/physically-install-your-surface-hub-device.md
@@ -3,10 +3,8 @@ title: Physically install Microsoft Surface Hub
description: The Microsoft Surface Hub Readiness Guide will help make sure that your site is ready for the installation.
ms.assetid: C764DBFB-429B-4B29-B4E8-D7F0073BC554
keywords: Surface Hub, readiness guide, installation location, mounting options
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, readiness
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md
index 5ac57b764e..b9239014a4 100644
--- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md
+++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Prepare your environment for Microsoft Surface Hub
description: This section contains an overview of the steps required to prepare your environment so that you can use all of the features of Microsoft Surface Hub.
ms.assetid: 336A206C-5893-413E-A270-61BFF3DF7DA9
keywords: prepare environment, features of Surface Hub, create and test device account, check network availability
-ms.prod: w10
-ms.mktglfcycl: plan
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/provisioning-packages-for-surface-hub.md b/devices/surface-hub/provisioning-packages-for-surface-hub.md
index 8646da068a..ad3c3d7d7e 100644
--- a/devices/surface-hub/provisioning-packages-for-surface-hub.md
+++ b/devices/surface-hub/provisioning-packages-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Create provisioning packages (Surface Hub)
description: For Windows 10, settings that use the registry or a configuration service provider (CSP) can be configured using provisioning packages.
ms.assetid: 8AA25BD4-8A8F-4B95-9268-504A49BA5345
keywords: add certificate, provisioning package
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/remote-surface-hub-management.md b/devices/surface-hub/remote-surface-hub-management.md
index d4b921b254..5038e225b5 100644
--- a/devices/surface-hub/remote-surface-hub-management.md
+++ b/devices/surface-hub/remote-surface-hub-management.md
@@ -2,10 +2,8 @@
title: Remote Surface Hub management
description: This section lists topics for managing Surface Hub.
keywords: remote management, MDM, install apps, monitor Surface Hub, Operations Management Suite, OMS
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/save-bitlocker-key-surface-hub.md b/devices/surface-hub/save-bitlocker-key-surface-hub.md
index 5fedc2bf80..3a013dd827 100644
--- a/devices/surface-hub/save-bitlocker-key-surface-hub.md
+++ b/devices/surface-hub/save-bitlocker-key-surface-hub.md
@@ -3,10 +3,8 @@ title: Save your BitLocker key (Surface Hub)
description: Every Microsoft Surface Hub is automatically set up with BitLocker drive encryption software. Microsoft strongly recommends that you make sure you back up your BitLocker recovery keys.
ms.assetid: E11E4AB6-B13E-4ACA-BCE1-4EDC9987E4F2
keywords: Surface Hub, BitLocker, Bitlocker recovery keys
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/set-up-your-surface-hub.md b/devices/surface-hub/set-up-your-surface-hub.md
index 876fd56138..80178e7c22 100644
--- a/devices/surface-hub/set-up-your-surface-hub.md
+++ b/devices/surface-hub/set-up-your-surface-hub.md
@@ -3,10 +3,8 @@ title: Set up Microsoft Surface Hub
description: Set up instructions for Surface Hub include a setup worksheet, and a walkthrough of the first-run program.
ms.assetid: 4D1722BC-704D-4471-BBBE-D0500B006221
keywords: set up instructions, Surface Hub, setup worksheet, first-run program
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/setup-worksheet-surface-hub.md b/devices/surface-hub/setup-worksheet-surface-hub.md
index f74f466fe8..f66fce4ef7 100644
--- a/devices/surface-hub/setup-worksheet-surface-hub.md
+++ b/devices/surface-hub/setup-worksheet-surface-hub.md
@@ -3,10 +3,8 @@ title: Setup worksheet (Surface Hub)
description: When you've finished pre-setup and are ready to start first-time setup for your Microsoft Surface Hub, make sure you have all the information listed in this section.
ms.assetid: AC6F925B-BADE-48F5-8D53-8B6FFF6EE3EB
keywords: Setup worksheet, pre-setup, first-time setup
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/skype-hybrid-voice.md b/devices/surface-hub/skype-hybrid-voice.md
index 8ad23c643f..4b3c12deab 100644
--- a/devices/surface-hub/skype-hybrid-voice.md
+++ b/devices/surface-hub/skype-hybrid-voice.md
@@ -2,10 +2,8 @@
title: Online or hybrid deployment using Skype Hybrid Voice environment (Surface Hub)
description: This topic explains how to enable Skype for Business Cloud PBX with on premises PSTN connectivity via Cloud Connector Edition or Skype for Business 2015 pool.
keywords: hybrid deployment, Skype Hybrid Voice
-ms.prod: w10
-ms.mktglfcycl: deploy
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/support-solutions-surface-hub.md b/devices/surface-hub/support-solutions-surface-hub.md
index b40eaef7de..66d4455737 100644
--- a/devices/surface-hub/support-solutions-surface-hub.md
+++ b/devices/surface-hub/support-solutions-surface-hub.md
@@ -3,10 +3,8 @@ title: Top support solutions for Microsoft Surface Hub
description: Find top solutions for common issues using Surface Hub.
ms.assetid: CF58F74D-8077-48C3-981E-FCFDCA34B34A
keywords: Troubleshoot common problems, setup issues
-ms.prod: w10
-ms.mktglfcycl: support
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: kaushika-msft
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surface-hub-authenticator-app.md b/devices/surface-hub/surface-hub-authenticator-app.md
index b4bbecf00d..d5f9dc8d57 100644
--- a/devices/surface-hub/surface-hub-authenticator-app.md
+++ b/devices/surface-hub/surface-hub-authenticator-app.md
@@ -1,10 +1,8 @@
---
title: Sign in to Surface Hub with Microsoft Authenticator
description: Use Microsoft Authenticator on your mobile device to sign in to Surface Hub.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surface-hub-downloads.md b/devices/surface-hub/surface-hub-downloads.md
index 0f35d022a9..257bc6b58b 100644
--- a/devices/surface-hub/surface-hub-downloads.md
+++ b/devices/surface-hub/surface-hub-downloads.md
@@ -1,10 +1,8 @@
---
title: Useful downloads for Microsoft Surface Hub
description: Downloads related to the Microsoft Surface Hub.
-ms.prod: w10
-ms.mktglfcycl: explore
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surface-hub-recovery-tool.md b/devices/surface-hub/surface-hub-recovery-tool.md
index c185f07d3c..81c91723b7 100644
--- a/devices/surface-hub/surface-hub-recovery-tool.md
+++ b/devices/surface-hub/surface-hub-recovery-tool.md
@@ -3,10 +3,8 @@ title: Using the Surface Hub Recovery Tool
description: How to use the Surface Hub Recovery Tool to re-image the SSD.
ms.assetid: FDB6182C-1211-4A92-A930-6C106BCD5DC1
keywords: manage Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surface-hub-start-menu.md b/devices/surface-hub/surface-hub-start-menu.md
index 1be0ee8978..5e6469aab1 100644
--- a/devices/surface-hub/surface-hub-start-menu.md
+++ b/devices/surface-hub/surface-hub-start-menu.md
@@ -1,10 +1,8 @@
---
title: Configure Surface Hub Start menu
description: Use MDM to customize the Start menu on Surface Hub.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surface-hub-wifi-direct.md b/devices/surface-hub/surface-hub-wifi-direct.md
index 3f933415fc..c4051021b6 100644
--- a/devices/surface-hub/surface-hub-wifi-direct.md
+++ b/devices/surface-hub/surface-hub-wifi-direct.md
@@ -2,10 +2,8 @@
title: How Surface Hub addresses Wi-Fi Direct security issues
description: This topic provides guidance on Wi-Fi Direct security risks.
keywords: change history
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/surfacehub-whats-new-1703.md b/devices/surface-hub/surfacehub-whats-new-1703.md
index 5c18d5d2d8..1473174177 100644
--- a/devices/surface-hub/surfacehub-whats-new-1703.md
+++ b/devices/surface-hub/surfacehub-whats-new-1703.md
@@ -1,9 +1,7 @@
---
title: What's new in Windows 10, version 1703 for Surface Hub
description: Windows 10, version 1703 (Creators Update) brings new features to Microsoft Surface Hub.
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: devices
+ms.prod: surface-hub
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
diff --git a/devices/surface-hub/troubleshoot-surface-hub.md b/devices/surface-hub/troubleshoot-surface-hub.md
index d33bb2ca55..a6158edff8 100644
--- a/devices/surface-hub/troubleshoot-surface-hub.md
+++ b/devices/surface-hub/troubleshoot-surface-hub.md
@@ -3,10 +3,8 @@ title: Troubleshoot Microsoft Surface Hub
description: Troubleshoot common problems, including setup issues, Exchange ActiveSync errors.
ms.assetid: CF58F74D-8077-48C3-981E-FCFDCA34B34A
keywords: Troubleshoot common problems, setup issues, Exchange ActiveSync errors
-ms.prod: w10
-ms.mktglfcycl: support
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
index 8ae6d82f72..c9183716e7 100644
--- a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
+++ b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
@@ -7,10 +7,8 @@ ms.author: jdecker
ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
-ms.prod: w10
-ms.mktglfcycl: support
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
---
# Configure domain name for Skype for Business
diff --git a/devices/surface-hub/use-room-control-system-with-surface-hub.md b/devices/surface-hub/use-room-control-system-with-surface-hub.md
index 8bcdde0580..7c5fc0e5d9 100644
--- a/devices/surface-hub/use-room-control-system-with-surface-hub.md
+++ b/devices/surface-hub/use-room-control-system-with-surface-hub.md
@@ -3,10 +3,8 @@ title: Using a room control system (Surface Hub)
description: Room control systems can be used with your Microsoft Surface Hub.
ms.assetid: DC365002-6B35-45C5-A2B8-3E1EB0CB8B50
keywords: room control system, Surface Hub
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/whiteboard-collaboration.md b/devices/surface-hub/whiteboard-collaboration.md
index dd9606c9c3..08346d20b4 100644
--- a/devices/surface-hub/whiteboard-collaboration.md
+++ b/devices/surface-hub/whiteboard-collaboration.md
@@ -1,10 +1,8 @@
---
title: Set up and use Whiteboard to Whiteboard collaboration
description: Microsoft Whiteboard’s latest update includes the capability for two Surface Hubs to collaborate in real time on the same board.
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/devices/surface-hub/wireless-network-management-for-surface-hub.md b/devices/surface-hub/wireless-network-management-for-surface-hub.md
index c7aac74ce4..516ddeab67 100644
--- a/devices/surface-hub/wireless-network-management-for-surface-hub.md
+++ b/devices/surface-hub/wireless-network-management-for-surface-hub.md
@@ -3,10 +3,8 @@ title: Wireless network management (Surface Hub)
description: Microsoft Surface Hub offers two options for network connectivity to your corporate network and Internet wireless, and wired. While both provide network access, we recommend you use a wired connection.
ms.assetid: D2CFB90B-FBAA-4532-B658-9AA33CAEA31D
keywords: network connectivity, wired connection
-ms.prod: w10
-ms.mktglfcycl: manage
+ms.prod: surface-hub
ms.sitesec: library
-ms.pagetype: surfacehub, networking
author: jdeckerms
ms.author: jdecker
ms.topic: article
diff --git a/windows/security/threat-protection/security-policy-settings/create-global-objects.md b/windows/security/threat-protection/security-policy-settings/create-global-objects.md
index ba22997a67..b8a4c7c248 100644
--- a/windows/security/threat-protection/security-policy-settings/create-global-objects.md
+++ b/windows/security/threat-protection/security-policy-settings/create-global-objects.md
@@ -76,6 +76,16 @@ This section describes how an attacker might exploit a feature or its configurat
### Vulnerability
+The **Create global objects** user right is required for a user account to create global objects in Remote Desktop sessions. Users can still create session-specfic objects without being assigned this user right. Assigning this right can be a security risk.
+
+By default, members of the **Administrators** group, the System account, and services that are started by the Service Control Manager are assigned the **Create global objects** user right. Users who are added to the **Remote Desktop Users** group also have this user right.
+
+### Countermeasure
+
+When non-administrators need to access a server using Remote Desktop, add the users to the **Remote Desktop Users** group rather than assining them this user right.
+
+### Vulnerability
+
>**Caution:** A user account that is given this user right has complete control over the system, and it can lead to the system being compromised. We highly recommend that you do not assign this right to any user accounts.
Windows examines a user's access token to determine the level of the user's privileges. Access tokens are built when users log on to the local device or connect to a remote device over a network. When you revoke a privilege, the change is immediately recorded, but the change is not reflected in the user's access token until the next time the user logs on or connects. Users with the ability to create or modify tokens can change the level of access for any currently logged on account. They could escalate their privileges or create a denial-of-service (DoS) condition.
diff --git a/windows/security/threat-protection/security-policy-settings/network-access-allow-anonymous-sidname-translation.md b/windows/security/threat-protection/security-policy-settings/network-access-allow-anonymous-sidname-translation.md
index f5d8338e71..b684158c99 100644
--- a/windows/security/threat-protection/security-policy-settings/network-access-allow-anonymous-sidname-translation.md
+++ b/windows/security/threat-protection/security-policy-settings/network-access-allow-anonymous-sidname-translation.md
@@ -29,7 +29,7 @@ Misuse of this policy setting is a common error that can cause data loss or prob
- Enabled
- An anonymous user can request the SID attribute for another user. An anonymous user with knowledge of an administrator's SID could contact a computer that has this policy enabled and use the SID to get the administrator's name. This setting affects the SID-to-name translation as well as the name-to-SID translation
+ An anonymous user can request the SID attribute for another user. An anonymous user with knowledge of an administrator's SID could contact a computer that has this policy enabled and use the SID to get the administrator's name. This setting affects the SID-to-name translation as well as the name-to-SID translation.
- Disabled
@@ -52,7 +52,7 @@ The following table lists the actual and effective default values for this polic
| Server type or GPO | Default value |
| - | - |
| Default Domain Policy| Not defined|
-| Default Domain Controller Policy | Note defined|
+| Default Domain Controller Policy | Not defined|
| Stand-Alone Server Default Settings | Disabled|
| DC Effective Default Settings | Enabled|
| Member Server Effective Default Settings| Disabled|
diff --git a/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md b/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md
index 8e5b6d0232..e42efc4ec8 100644
--- a/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md
+++ b/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md
@@ -630,7 +630,7 @@ Here are the minimum steps for WEF to operate:
-
+
diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
index 4bbf440bbc..b3f44ab315 100644
--- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
+++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
@@ -78,7 +78,7 @@ For October 2017, we are announcing an update to system.management.automation.dl
Microsoft recommends that you block the following Microsoft-signed applications and PowerShell files by merging the following policy into your existing policy to add these deny rules using the Merge-CIPolicy cmdlet:
```
-
+
10.0.0.0{A244370E-44C9-4C06-B551-F6016E563076}
@@ -132,6 +132,7 @@ Microsoft recommends that you block the following Microsoft-signed applications
+
@@ -508,6 +509,7 @@ Microsoft recommends that you block the following Microsoft-signed applications
+