From 6d38dc68b7390133f5f9fa340c53740b3dd64e39 Mon Sep 17 00:00:00 2001
From: Brian Lich <brianlic@microsoft.com>
Date: Mon, 21 Mar 2016 11:28:01 -0700
Subject: [PATCH] refreshing conversion test build

---
 windows/deploy/TOC.md                         |   62 +-
 ...st.md => activate-forest-by-proxy-vamt.md} |    3 +-
 ...rest-online.md => activate-forest-vamt.md} |    5 +-
 ...ctive-directory-based-activation-client.md |    7 +-
 ...vate-using-key-management-service-vamt.md} |    3 +-
 ...md => activate-windows-10-clients-vamt.md} |    5 +-
 ...ive-directory-based-activation-overview.md |    5 +-
 ...ystem-image-using-configuration-manager.md |    3 +-
 ...-windows-pe-using-configuration-manager.md |   11 +-
 ...30-win8.md => add-manage-products-vamt.md} |    7 +-
 ...0-win8.md => add-remove-computers-vamt.md} |    5 +-
 ...win8.md => add-remove-product-key-vamt.md} |    3 +-
 ...t-to-microsoft-during-activation-client.md |    3 +-
 ...gn-applications-using-roles-in-mdt-2013.md |   10 +-
 ...d-environment-for-windows-81-deployment.md |   14 +-
 .../change-history-for-deploy-windows-10.md   |    3 +-
 ...igration-store-type-usmt-win7-usmt-win8.md |    1 -
 windows/deploy/common-issues-usmt-win8.md     |    1 -
 ...migration-scenarios-usmt-win7-usmt-win8.md |    1 -
 ....md => configure-client-computers-vamt.md} |    3 +-
 ...configure-mdt-2013-for-userexit-scripts.md |   11 +-
 windows/deploy/configure-mdt-2013-settings.md |    3 +-
 .../configure-mdt-deployment-share-rules.md   |   11 +-
 .../configxml-file-usmt-win7-usmt-win8.md     |    1 -
 ...icts-and-precedence-usmt-win7-usmt-win8.md |    1 -
 ...0-boot-image-with-configuration-manager.md |   11 +-
 ...ence-with-configuration-manager-and-mdt.md |   12 +-
 .../create-a-windows-81-reference-image.md    |   14 +-
 ...-windows-81-using-configuration-manager.md |    3 +-
 ...custom-xml-examples-usmt-win7-usmt-win8.md |    1 -
 ...mize-usmt-xml-files-usmt-win7-usmt-win8.md |    1 -
 ...eploy-a-windows-81-image-using-mdt-2013.md |   20 +-
 ...-81-using-pxe-and-configuration-manager.md |    5 +-
 ...em-center-2012-r2-configuration-manager.md |    5 +-
 ...1-with-the-microsoft-deployment-toolkit.md |    5 +-
 ...-go-in-your-organization-small-scenario.md |   11 +-
 ...ine-what-to-migrate-usmt-win7-usmt-win8.md |    1 -
 ...igration-store-size-usmt-win7-usmt-win8.md |    1 -
 .../deploy/exclude-files-and-settings-usmt.md |    1 -
 ...-from-a-compressed-usmt-migration-store.md |    1 -
 ...1-deployment-with-configuration-manager.md |   15 +-
 ...tly-asked-questions-usmt-win7-usmt-win8.md |    1 -
 ...general-conventions-usmt-win7-usmt-win8.md |    1 -
 ...-the-microsoft-deployment-toolkit--mdt-.md |    3 +-
 ...th-the-user-state-migration-tool--usmt-.md |    1 -
 .../hard-link-migration-store-usmt-win8.md    |    5 +-
 .../how-usmt-works-usmt-win7-usmt-win8.md     |    1 -
 ...plications-settings-usmt-win7-usmt-win8.md |    1 -
 ...-file-types-files-and-folders-usmt-win8.md |    5 +-
 ...ing-system-settings-usmt-win7-usmt-win8.md |    1 -
 .../identify-users-usmt-win7-usmt-win8.md     |    1 -
 ...-30-win8.md => import-export-vamt-data.md} |    3 +-
 .../deploy/include-files-and-settings-usmt.md |    1 -
 windows/deploy/index.md                       |    8 +-
 ...t-30-win8.md => install-configure-vamt.md} |    9 +-
 ...win8.md => install-kms-client-key-vamt.md} |    3 +-
 ...30-win8.md => install-product-key-vamt.md} |    3 +-
 ...l-vamt-vamt-30-win8.md => install-vamt.md} |    3 +-
 ...ate-configuration-manager-with-mdt-2013.md |    9 +-
 ...mtvamt-30-win8.md => introduction-vamt.md} |    3 +-
 windows/deploy/key-features-in-mdt-2013.md    |    5 +-
 ...vamt-30-win8.md => kms-activation-vamt.md} |    5 +-
 .../loadstate-syntax-usmt-win7-usmt-win8.md   |    1 -
 ...-30-win8.md => local-reactivation-vamt.md} |    3 +-
 .../deploy/log-files-usmt-win7-usmt-win8.md   |    1 -
 ...-30-win8.md => manage-activations-vamt.md} |   13 +-
 ...30-win8.md => manage-product-keys-vamt.md} |    7 +-
 ...ta-vamt-30-win8.md => manage-vamt-data.md} |    3 +-
 .../deploy/mdt-2013-lite-touch-components.md  |   19 +-
 .../deploy/migrate-application-settings.md    |    1 -
 ...migrate-efs-files-and-certificates-umst.md |    1 -
 windows/deploy/migrate-user-accounts-usmt.md  |    1 -
 .../migration-store-encryption-usmt-win8.md   |    1 -
 .../deploy/migration-store-types-overview.md  |    1 -
 windows/deploy/monitor-activation-client.md   |    3 +-
 ...1-deployment-with-configuration-manager.md |    5 +-
 windows/deploy/offline-migration-reference.md |    1 -
 ...t-30-win8.md => online-activation-vamt.md} |    5 +-
 windows/deploy/placeholder.md                 |    1 -
 .../plan-for-volume-activation-client.md      |    3 +-
 ...plan-your-migration-usmt-win7-usmt-win8.md |    1 -
 .../prepare-for-deployment-with-mdt-2013.md   |   14 +-
 ...f-windows-81-with-configuration-manager.md |   17 +-
 ...mt-30-win8.md => proxy-activation-vamt.md} |   11 +-
 ...vironment-variables-usmt-win7-usmt-win8.md |    1 -
 ...sh-a-windows-7-computer-with-windows-81.md |   10 +-
 ...-windows-81-using-configuration-manager.md |   10 +-
 ...amt-30-win8.md => remove-products-vamt.md} |    3 +-
 ...s-7-computer-with-a-windows-81-computer.md |   11 +-
 ...-windows-81-using-configuration-manager.md |   15 +-
 .../deploy/reroute-files-and-settings-usmt.md |    1 -
 windows/deploy/return-codes-usmt-win8.md      |    1 -
 .../scanstate-syntax-usmt-win7-usmt-win8.md   |    1 -
 ...in8.md => scenario-kms-activation-vamt.md} |    7 +-
 ....md => scenario-online-activation-vamt.md} |    9 +-
 ...8.md => scenario-proxy-activation-vamt.md} |    9 +-
 .../deploy/set-up-mdt-2013-for-bitlocker.md   |   10 +-
 windows/deploy/sideload-apps-in-windows-10.md |    9 +-
 ...ows-81-deployment-in-a-test-environment.md |    3 +-
 ...test-your-migration-usmt-win7-usmt-win8.md |    1 -
 .../understanding-migration-xml-files.md      |    1 -
 ...-win8.md => update-product-status-vamt.md} |    5 +-
 ...ws-10-images-with-provisioning-packages.md |   11 +-
 ...with-system-center-configuraton-manager.md |   16 +-
 ...0-with-the-microsoft-deployment-toolkit.md |   15 +-
 ...use-orchestrator-runbooks-with-mdt-2013.md |   12 +-
 ...stage-windows-81-deployment-information.md |   13 +-
 ...olume-activation-management-tool-client.md |    5 +-
 .../deploy/use-vamt-in-windows-powershell.md  |    1 -
 .../deploy/use-web-services-in-mdt-2013.md    |   14 +-
 ...gration-tool--usmt--command-line-syntax.md |    5 +-
 ...ate-migration-tool--usmt--how-to-topics.md |    5 +-
 ...e-migration-tool--usmt--overview-topics.md |    1 -
 ...er-state-migration-tool--usmt--overview.md |    1 -
 ...gration-tool--usmt--technical-reference.md |    3 +-
 ...e-migration-tool--usmt--troubleshooting.md |    1 -
 ...tate-migration-toolkit--usmt--reference.md |    1 -
 ...usmt-best-practices-usmt-win7-usmt-win8.md |    1 -
 .../usmt-requirements-usmt-win7-usmt-win8.md  |    1 -
 windows/deploy/usmt-resources-usmt-win8.md    |    1 -
 .../usmt-xml-reference-usmt-win7-usmt-win8.md |    1 -
 windows/deploy/usmtutils-syntax-usmt-win8.md  |    1 -
 ...s-vamt-30-win8.md => vamt-known-issues.md} |    1 -
 ...s-vamt-30-win8.md => vamt-requirements.md} |    5 +-
 ...s-vamt-30-win8.md => vamt-step-by-step.md} |   13 +-
 ...ndition-of-a-compressed-migration-store.md |    1 -
 ...d => volume-activation-management-tool.md} |   19 +-
 ...ent.md => volume-activation-windows-10.md} |    7 +-
 ...t-does-usmt-migrate-usmt-win7-usmt-win8.md |    1 -
 .../deploy/windows-10-deployment-scenarios.md |   12 +-
 .../windows-10-deployment-tools-reference.md  |    3 +-
 windows/deploy/windows-10-edition-upgrades.md |    3 +-
 .../windows-adk-scenarios-for-it-pros.md      |    3 +-
 .../windows-deployment-scenarios-and-tools.md |   18 +-
 ...grade-and-migration-considerations-win8.md |    1 -
 ...ml-elements-library-usmt-win7-usmt-win8.md |    1 -
 windows/deploy/xml-file-requirements.md       |    1 -
 windows/keep-secure/TOC.md                    |    2 +-
 ...-credential-manager-as-a-trusted-caller.md |   10 +-
 .../access-this-computer-from-the-network.md  |   10 +-
 .../keep-secure/account-lockout-duration.md   |    9 +-
 windows/keep-secure/account-lockout-policy.md |    1 -
 .../keep-secure/account-lockout-threshold.md  |    9 +-
 windows/keep-secure/account-policies.md       |    1 -
 .../accounts-administrator-account-status.md  |   10 +-
 .../accounts-block-microsoft-accounts.md      |   10 +-
 .../accounts-guest-account-status.md          |    9 +-
 ...f-blank-passwords-to-console-logon-only.md |    3 +-
 .../accounts-rename-administrator-account.md  |   10 +-
 .../accounts-rename-guest-account.md          |   10 +-
 .../act-as-part-of-the-operating-system.md    |   10 +-
 ...ged-apps-to-existing-applocker-rule-set.md |    3 +-
 .../keep-secure/add-workstations-to-domain.md |   10 +-
 .../adjust-memory-quotas-for-a-process.md     |   10 +-
 windows/keep-secure/administer-applocker.md   |    1 -
 .../administer-security-policy-settings.md    |   13 +-
 ...advanced-security-audit-policy-settings.md |    1 -
 .../advanced-security-auditing-faq.md         |    3 +-
 .../keep-secure/advanced-security-auditing.md |    3 +-
 windows/keep-secure/allow-log-on-locally.md   |   10 +-
 ...-log-on-through-remote-desktop-services.md |   10 +-
 .../applocker-architecture-and-components.md  |    1 -
 windows/keep-secure/applocker-functions.md    |    1 -
 .../keep-secure/applocker-overview-server.md  |    1 -
 .../applocker-policies-deployment-guide.md    |    1 -
 .../applocker-policies-design-guide.md        |    1 -
 .../applocker-policy-use-scenarios.md         |    1 -
 .../applocker-processes-and-interactions.md   |    1 -
 windows/keep-secure/applocker-settings.md     |    1 -
 .../applocker-technical-reference.md          |    1 -
 ...-basic-audit-policy-on-a-file-or-folder.md |    1 -
 .../audit-account-lockout-sec-audit.md        |    3 +-
 .../audit-application-generated.md            |    3 +-
 .../audit-application-group-management.md     |    3 +-
 .../keep-secure/audit-audit-policy-change.md  |    3 +-
 ...dit-the-access-of-global-system-objects.md |   10 +-
 ...the-use-of-backup-and-restore-privilege.md |   10 +-
 .../audit-authentication-policy-change.md     |    3 +-
 .../audit-authorization-policy-change.md      |    3 +-
 .../audit-central-access-policy-staging.md    |    3 +-
 .../audit-certification-services.md           |    3 +-
 .../audit-computer-account-management.md      |    3 +-
 .../audit-credential-validation.md            |    3 +-
 ...-detailed-directory-service-replication.md |    3 +-
 .../audit-detailed-file-share-sec-audit.md    |    3 +-
 .../audit-directory-service-access.md         |    3 +-
 .../audit-directory-service-changes.md        |    3 +-
 .../audit-directory-service-replication.md    |    3 +-
 .../audit-distribution-group-management.md    |    3 +-
 windows/keep-secure/audit-dpapi-activity.md   |    3 +-
 windows/keep-secure/audit-file-share.md       |    3 +-
 windows/keep-secure/audit-file-system.md      |    3 +-
 .../audit-filtering-platform-connection.md    |    3 +-
 ...iltering-platform-packet-drop-sec-audit.md |    3 +-
 .../audit-filtering-platform-policy-change.md |    3 +-
 ...policy-subcategory-settings-to-override.md |   10 +-
 windows/keep-secure/audit-group-membership.md |    3 +-
 .../keep-secure/audit-handle-manipulation.md  |    3 +-
 windows/keep-secure/audit-ipsec-driver.md     |    3 +-
 .../keep-secure/audit-ipsec-extended-mode.md  |    3 +-
 windows/keep-secure/audit-ipsec-main-mode.md  |    3 +-
 windows/keep-secure/audit-ipsec-quick-mode.md |    3 +-
 ...rberos-authentication-service-sec-audit.md |    3 +-
 ...udit-kerberos-service-ticket-operations.md |    3 +-
 .../audit-kernel-object-sec-audit.md          |    3 +-
 windows/keep-secure/audit-logoff.md           |    3 +-
 windows/keep-secure/audit-logon.md            |    3 +-
 .../audit-mpssvc-rule-level-policy-change.md  |    5 +-
 .../audit-network-policy-server.md            |    3 +-
 ...t-non-sensitive-privilege-use-sec-audit.md |    5 +-
 ...it-other-account-logon-events-sec-audit.md |    3 +-
 .../audit-other-account-management-events.md  |    3 +-
 .../audit-other-logonlogoff-events.md         |    3 +-
 .../audit-other-object-access-events.md       |    3 +-
 .../audit-other-policy-change-events.md       |    3 +-
 ...it-other-privilege-use-events-sec-audit.md |    1 -
 .../keep-secure/audit-other-system-events.md  |    3 +-
 windows/keep-secure/audit-pnp-activity.md     |    3 +-
 windows/keep-secure/audit-policy.md           |    1 -
 windows/keep-secure/audit-process-creation.md |    3 +-
 .../audit-process-termination-sec-audit.md    |    3 +-
 windows/keep-secure/audit-registry.md         |    3 +-
 .../keep-secure/audit-removable-storage.md    |    3 +-
 windows/keep-secure/audit-rpc-events.md       |    3 +-
 windows/keep-secure/audit-sam-sec-audit.md    |    3 +-
 .../audit-security-group-management.md        |    3 +-
 .../audit-security-state-change.md            |    3 +-
 .../audit-security-system-extension.md        |    3 +-
 ...audit-sensitive-privilege-use-sec-audit.md |    3 +-
 ...iately-if-unable-to-log-security-audits.md |   10 +-
 windows/keep-secure/audit-special-logon.md    |    3 +-
 windows/keep-secure/audit-system-integrity.md |    3 +-
 .../audit-user-account-management.md          |    3 +-
 .../keep-secure/audit-user-device-claims.md   |    3 +-
 .../back-up-files-and-directories.md          |   10 +-
 ...up-thetpm-recovery-information-to-ad-ds.md |    1 -
 .../basic-audit-account-logon-events.md       |    1 -
 .../basic-audit-account-management.md         |    1 -
 .../basic-audit-directory-service-access.md   |    1 -
 .../keep-secure/basic-audit-logon-events.md   |    1 -
 .../keep-secure/basic-audit-object-access.md  |    3 +-
 .../keep-secure/basic-audit-policy-change.md  |    3 +-
 .../keep-secure/basic-audit-privilege-use.md  |    1 -
 .../basic-audit-process-tracking.md           |    3 +-
 .../keep-secure/basic-audit-system-events.md  |    1 -
 .../basic-security-audit-policies.md          |    3 +-
 .../basic-security-audit-policy-settings.md   |    1 -
 .../keep-secure/bcd-settings-and-bitlocker.md |    1 -
 .../keep-secure/bitlocker-basic-deployment.md |    1 -
 .../keep-secure/bitlocker-countermeasures.md  |    3 +-
 ...locker-frequently-asked-questions--faq-.md |    3 +-
 .../bitlocker-group-policy-settings.md        |    3 +-
 ...er-how-to-deploy-on-windows-server-2012.md |    1 -
 .../bitlocker-how-to-enable-network-unlock.md |    1 -
 .../bitlocker-overview-roletech-overview.md   |    3 +-
 .../bitlocker-recovery-guide-plan.md          |    1 -
 ...ve-encryption-tools-to-manage-bitlocker.md |    1 -
 ...-use-bitlocker-recovery-password-viewer.md |    1 -
 .../block-untrusted-fonts-in-an-enterprise.md |    3 +-
 .../keep-secure/bypass-traverse-checking.md   |   10 +-
 ...ange-history-for-keep-windows-10-secure.md |    8 +-
 windows/keep-secure/change-the-system-time.md |   10 +-
 windows/keep-secure/change-the-time-zone.md   |   10 +-
 .../change-the-tpm-owner-password.md          |    1 -
 ...oose-the-right-bitlocker-countermeasure.md |    3 +-
 ...gure-an-applocker-policy-for-audit-only.md |    1 -
 ...e-an-applocker-policy-for-enforce-rules.md |    1 -
 ...figure-exceptions-for-an-applocker-rule.md |    1 -
 windows/keep-secure/configure-s-mime.md       |   13 +-
 ...figure-the-application-identity-service.md |    1 -
 ...re-the-applocker-reference-computer-ops.md |    1 -
 ...nfigure-windows-defender-for-windows-10.md |   13 +-
 ...t-policy-settings-for-an-event-category.md |    3 +-
 windows/keep-secure/create-a-pagefile.md      |   10 +-
 .../create-a-rule-for-packaged-apps.md        |    1 -
 ...-a-rule-that-uses-a-file-hash-condition.md |    1 -
 ...reate-a-rule-that-uses-a-path-condition.md |    1 -
 ...-a-rule-that-uses-a-publisher-condition.md |    1 -
 windows/keep-secure/create-a-token-object.md  |   10 +-
 .../create-applocker-default-rules.md         |    1 -
 windows/keep-secure/create-global-objects.md  |   10 +-
 ...cations-deployed-to-each-business-group.md |    1 -
 .../create-permanent-shared-objects.md        |   10 +-
 windows/keep-secure/create-symbolic-links.md  |   10 +-
 ...create-your-applocker-planning-document.md |    1 -
 .../create-your-applocker-policies.md         |    1 -
 .../create-your-applocker-rules.md            |    1 -
 ...g-a-device-guard-policy-for-signed-apps.md |    3 +-
 windows/keep-secure/credential-guard.md       |    3 +-
 ...iptor-definition-language--sddl--syntax.md |   10 +-
 ...iptor-definition-language--sddl--syntax.md |   10 +-
 windows/keep-secure/debug-programs.md         |   10 +-
 .../keep-secure/delete-an-applocker-rule.md   |    1 -
 ...ccess-to-this-computer-from-the-network.md |   10 +-
 .../keep-secure/deny-log-on-as-a-batch-job.md |   10 +-
 .../keep-secure/deny-log-on-as-a-service.md   |   10 +-
 windows/keep-secure/deny-log-on-locally.md    |   10 +-
 ...-log-on-through-remote-desktop-services.md |   10 +-
 ...cies-by-using-the-enforce-rules-setting.md |    1 -
 ...oy-the-applocker-policy-into-production.md |    1 -
 ...p-policy-structure-and-rule-enforcement.md |    1 -
 ...igitally-signed-on-a-reference-computer.md |    1 -
 ...ine-your-application-control-objectives.md |    1 -
 ...vice-guard-certification-and-compliance.md |   10 +-
 .../device-guard-deployment-guide.md          |   24 +-
 ...s-allow-undock-without-having-to-log-on.md |   10 +-
 ...wed-to-format-and-eject-removable-media.md |   10 +-
 ...t-users-from-installing-printer-drivers.md |   10 +-
 ...m-access-to-locally-logged-on-user-only.md |   12 +-
 ...y-access-to-locally-logged-on-user-only.md |   12 +-
 ...-users-try-to-run-a-blocked-application.md |    1 -
 windows/keep-secure/dll-rules-in-applocker.md |    1 -
 ...tructure-and-applocker-rule-enforcement.md |    3 +-
 ...pplication-control-management-processes.md |    1 -
 .../document-your-application-list.md         |    1 -
 .../document-your-applocker-rules.md          |    3 +-
 ...llow-server-operators-to-schedule-tasks.md |   10 +-
 ...roller-ldap-server-signing-requirements.md |   10 +-
 ...refuse-machine-account-password-changes.md |   10 +-
 ...ypt-or-sign-secure-channel-data--always.md |   10 +-
 ...rypt-secure-channel-data--when-possible.md |   10 +-
 ...sign-secure-channel-data--when-possible.md |   10 +-
 ...isable-machine-account-password-changes.md |   10 +-
 ...er-maximum-machine-account-password-age.md |   10 +-
 ...ong--windows-2000-or-later--session-key.md |   10 +-
 .../keep-secure/edit-an-applocker-policy.md   |    1 -
 windows/keep-secure/edit-applocker-rules.md   |    3 +-
 ...r-accounts-to-be-trusted-for-delegation.md |   10 +-
 .../enable-the-dll-rule-collection.md         |    1 -
 windows/keep-secure/encrypted-hard-drive.md   |    1 -
 .../keep-secure/enforce-applocker-rules.md    |    1 -
 .../keep-secure/enforce-password-history.md   |   10 +-
 .../enforce-user-logon-restrictions.md        |   10 +-
 .../enterprise-security-guides-portal.md      |    3 +-
 .../executable-rules-in-applocker.md          |    1 -
 .../export-an-applocker-policy-from-a-gpo.md  |    1 -
 ...port-an-applocker-policy-to-an-xml-file.md |    1 -
 ...lobal-object-access-auditing--sec-audit.md |    3 +-
 .../force-shutdown-from-a-remote-system.md    |   10 +-
 .../keep-secure/generate-security-audits.md   |   10 +-
 ...ed-with-windows-defender-for-windows-10.md |  171 +-
 ...o-run-on-device-guard-protected-devices.md |   13 +-
 .../how-applocker-works-techref.md            |    3 +-
 ...w-to-configure-security-policy-settings.md |   10 +-
 .../how-user-account-control-works.md         |    1 -
 ...personate-a-client-after-authentication.md |   10 +-
 ...microsoft-passport-in-your-organization.md |   11 +-
 ...-applocker-policy-from-another-computer.md |    1 -
 .../import-an-applocker-policy-into-a-gpo.md  |    1 -
 .../increase-a-process-working-set.md         |   10 +-
 .../increase-scheduling-priority.md           |   10 +-
 windows/keep-secure/index.md                  |    6 +-
 ...lize-and-configure-ownership-of-the-tpm.md |    3 +-
 ...gital-certificates-on-windows-10-mobile.md |    8 -
 ...-information-when-the-session-is-locked.md |   10 +-
 ...ive-logon-do-not-display-last-user-name.md |   10 +-
 ...ctive-logon-do-not-require-ctrl-alt-del.md |   10 +-
 ...logon-machine-account-lockout-threshold.md |   10 +-
 ...eractive-logon-machine-inactivity-limit.md |   10 +-
 ...age-text-for-users-attempting-to-log-on.md |   10 +-
 ...ge-title-for-users-attempting-to-log-on.md |   10 +-
 ...case-domain-controller-is-not-available.md |   10 +-
 ...er-to-change-password-before-expiration.md |   10 +-
 ...er-authentication-to-unlock-workstation.md |   10 +-
 .../interactive-logon-require-smart-card.md   |   10 +-
 ...ctive-logon-smart-card-removal-behavior.md |   10 +-
 windows/keep-secure/kerberos-policy.md        |    1 -
 .../load-and-unload-device-drivers.md         |   10 +-
 windows/keep-secure/lock-pages-in-memory.md   |   10 +-
 windows/keep-secure/log-on-as-a-batch-job.md  |   10 +-
 windows/keep-secure/log-on-as-a-service.md    |   10 +-
 .../maintain-applocker-policies.md            |    1 -
 .../manage-auditing-and-security-log.md       |   10 +-
 ...y-verification-using-microsoft-passport.md |   13 +-
 .../manage-packaged-apps-with-applocker.md    |    1 -
 windows/keep-secure/manage-tpm-commands.md    |    1 -
 windows/keep-secure/manage-tpm-lockout.md     |    1 -
 .../maximum-lifetime-for-service-ticket.md    |   10 +-
 ...aximum-lifetime-for-user-ticket-renewal.md |    9 +-
 .../maximum-lifetime-for-user-ticket.md       |   10 +-
 windows/keep-secure/maximum-password-age.md   |   10 +-
 ...ance-for-computer-clock-synchronization.md |   10 +-
 ...r-policies-by-using-set-applockerpolicy.md |    3 +-
 .../merge-applocker-policies-manually.md      |    1 -
 ...t-digitally-sign-communications--always.md |   10 +-
 ...y-sign-communications--if-server-agrees.md |   10 +-
 ...ted-password-to-third-party-smb-servers.md |   12 +-
 ...time-required-before-suspending-session.md |   10 +-
 ...pt-s4u2self-to-obtain-claim-information.md |   10 +-
 ...r-digitally-sign-communications--always.md |   10 +-
 ...y-sign-communications--if-client-agrees.md |   10 +-
 ...connect-clients-when-logon-hours-expire.md |   10 +-
 ...server-spn-target-name-validation-level.md |   10 +-
 ...microsoft-passport-and-password-changes.md |    5 +-
 ...oft-passport-errors-during-pin-creation.md |   12 +-
 .../keep-secure/microsoft-passport-guide.md   |   12 -
 windows/keep-secure/minimum-password-age.md   |   10 +-
 .../keep-secure/minimum-password-length.md    |   10 +-
 windows/keep-secure/modify-an-object-label.md |   10 +-
 .../modify-firmware-environment-values.md     |   10 +-
 ...onitor-application-usage-with-applocker.md |    1 -
 ...tral-access-policy-and-rule-definitions.md |    1 -
 windows/keep-secure/monitor-claim-types.md    |    1 -
 .../monitor-resource-attribute-definitions.md |    1 -
 ...icies-associated-with-files-and-folders.md |    1 -
 ...ss-policies-that-apply-on-a-file-server.md |    1 -
 ...esource-attributes-on-files-and-folders.md |    1 -
 ...or-the-use-of-removable-storage-devices.md |    1 -
 ...r-user-and-device-claims-during-sign-in.md |    3 +-
 ...ess-allow-anonymous-sidname-translation.md |   10 +-
 ...-enumeration-of-sam-accounts-and-shares.md |   10 +-
 ...w-anonymous-enumeration-of-sam-accounts.md |   10 +-
 ...-credentials-for-network-authentication.md |    9 +-
 ...ne-permissions-apply-to-anonymous-users.md |   10 +-
 ...-pipes-that-can-be-accessed-anonymously.md |   10 +-
 ...-accessible-registry-paths-and-subpaths.md |   10 +-
 ...cess-remotely-accessible-registry-paths.md |   10 +-
 ...nymous-access-to-named-pipes-and-shares.md |   10 +-
 ...shares-that-can-be-accessed-anonymously.md |   10 +-
 ...g-and-security-model-for-local-accounts.md |   10 +-
 .../network-list-manager-policies.md          |    1 -
 ...ystem-to-use-computer-identity-for-ntlm.md |   10 +-
 ...allow-localsystem-null-session-fallback.md |    9 +-
 ...-this-computer-to-use-online-identities.md |    9 +-
 ...e-encryption-types-allowed-for-kerberos.md |    9 +-
 ...ager-hash-value-on-next-password-change.md |   10 +-
 ...ty-force-logoff-when-logon-hours-expire.md |   10 +-
 ...curity-lan-manager-authentication-level.md |   10 +-
 ...curity-ldap-client-signing-requirements.md |   10 +-
 ...sp-based--including-secure-rpc--clients.md |   10 +-
 ...sp-based--including-secure-rpc--servers.md |   10 +-
 ...rver-exceptions-for-ntlm-authentication.md |   10 +-
 ...lm-add-server-exceptions-in-this-domain.md |   10 +-
 ...strict-ntlm-audit-incoming-ntlm-traffic.md |   10 +-
 ...udit-ntlm-authentication-in-this-domain.md |   10 +-
 ...ity-restrict-ntlm-incoming-ntlm-traffic.md |   10 +-
 ...ntlm-ntlm-authentication-in-this-domain.md |   10 +-
 ...outgoing-ntlm-traffic-to-remote-servers.md |   10 +-
 .../optimize-applocker-performance.md         |    1 -
 ...ckaged-app-installer-rules-in-applocker.md |    1 -
 ...-event-id-200.md => passport-event-300.md} |    3 +-
 ...sword-must-meet-complexity-requirements.md |    9 +-
 windows/keep-secure/password-policy.md        |    1 -
 .../perform-volume-maintenance-tasks.md       |   10 +-
 windows/keep-secure/placeholder.md            |    1 -
 .../plan-for-applocker-policy-management.md   |    1 -
 ...loying-advanced-security-audit-policies.md |    1 -
 ...repare-people-to-use-microsoft-passport.md |   13 +-
 ...ion-for-bitlocker-planning-and-policies.md |    1 -
 windows/keep-secure/profile-single-process.md |   10 +-
 .../keep-secure/profile-system-performance.md |   10 +-
 ...protect-bitlocker-from-pre-boot-attacks.md |    5 +-
 ...-the-health-of-windows-10-based-devices.md |   15 +-
 ...nd-storage-area-networks-with-bitlocker.md |    1 -
 ...le-allow-automatic-administrative-logon.md |   10 +-
 ...py-and-access-to-all-drives-and-folders.md |   10 +-
 .../refresh-an-applocker-policy.md            |    1 -
 ...lobal-object-access-auditing--sec-audit.md |    3 +-
 .../remove-computer-from-docking-station.md   |   10 +-
 .../replace-a-process-level-token.md          |   10 +-
 ...ements-for-deploying-applocker-policies.md |    1 -
 .../requirements-to-use-applocker.md          |    1 -
 .../reset-account-lockout-counter-after.md    |    9 +-
 .../restore-files-and-directories.md          |   10 +-
 ...the-automatically-generate-rules-wizard.md |    1 -
 ...-tpm-information-from-windows-8-clients.md |    1 -
 .../keep-secure/script-rules-in-applocker.md  |    1 -
 ...advanced-security-audit-policy-settings.md |    1 -
 .../security-auditing-overview-glbl.md        |    1 -
 .../security-considerations-for-applocker.md  |    1 -
 windows/keep-secure/security-options.md       |    1 -
 .../security-policy-settings-reference.md     |    3 +-
 .../keep-secure/security-policy-settings.md   |    9 +-
 windows/keep-secure/security-technologies.md  |    1 -
 .../select-types-of-rules-to-create.md        |    1 -
 windows/keep-secure/shut-down-the-system.md   |   10 +-
 ...o-be-shut-down-without-having-to-log-on.md |   10 +-
 .../shutdown-clear-virtual-memory-pagefile.md |   10 +-
 ...e-passwords-using-reversible-encryption.md |    9 +-
 .../switch-pcr-banks-on-tpm-2-0-devices.md    |    1 -
 .../synchronize-directory-service-data.md     |   10 +-
 ...on-for-user-keys-stored-on-the-computer.md |   10 +-
 ...thms-for-encryption-hashing-and-signing.md |   12 +-
 ...nsensitivity-for-non-windows-subsystems.md |   12 +-
 ...ernal-system-objects--eg-symbolic-links.md |   10 +-
 .../system-settings-optional-subsystems.md    |   10 +-
 ...ables-for-software-restriction-policies.md |   10 +-
 ...ake-ownership-of-files-or-other-objects.md |   10 +-
 ...er-policy-by-using-test-applockerpolicy.md |    3 +-
 .../test-and-update-an-applocker-policy.md    |    1 -
 .../tools-to-use-with-applocker.md            |    1 -
 .../keep-secure/tpm-fundamentals-windows-8.md |    1 -
 ...leshoot-windows-defender-for-windows-10.md | 3526 +++++++----------
 .../trusted-platform-module--tpm-2-0--.md     |   12 -
 ...m-module-services-group-policy-settings.md |    1 -
 ...ted-platform-module-technology-overview.md |    1 -
 ...s-of-attacks-for-volume-encryption-keys.md |    3 +-
 ...derstand-applocker-enforcement-settings.md |    1 -
 ...stand-applocker-policy-design-decisions.md |    3 +-
 ...ent-setting-inheritance-in-group-policy.md |    1 -
 ...the-applocker-policy-deployment-process.md |    1 -
 ...plocker-allow-and-deny-actions-on-rules.md |    1 -
 .../understanding-applocker-default-rules.md  |    1 -
 .../understanding-applocker-rule-behavior.md  |    1 -
 ...nderstanding-applocker-rule-collections.md |    1 -
 ...standing-applocker-rule-condition-types.md |    1 -
 ...understanding-applocker-rule-exceptions.md |    1 -
 ...e-file-hash-rule-condition-in-applocker.md |    3 +-
 ...ng-the-path-rule-condition-in-applocker.md |    3 +-
 ...e-publisher-rule-condition-in-applocker.md |    3 +-
 ...-create-and-maintain-applocker-policies.md |    1 -
 ...restriction-policies-in-the-same-domain.md |    1 -
 ...he-applocker-windows-powershell-cmdlets.md |    1 -
 ...rding-to-assist-in-instrusion-detection.md |    1 -
 ...-for-the-built-in-administrator-account.md |   12 +-
 ...vation-without-using-the-secure-desktop.md |   10 +-
 ...r-administrators-in-admin-approval-mode.md |   10 +-
 ...the-elevation-prompt-for-standard-users.md |   10 +-
 ...-installations-and-prompt-for-elevation.md |   10 +-
 ...ecutables-that-are-signed-and-validated.md |   10 +-
 ...-that-are-installed-in-secure-locations.md |   10 +-
 .../user-account-control-overview.md          |    3 +-
 ...l-administrators-in-admin-approval-mode.md |   10 +-
 ...ccount-control-security-policy-settings.md |    3 +-
 ...re-desktop-when-prompting-for-elevation.md |   10 +-
 ...ry-write-failures-to-per-user-locations.md |   12 +-
 windows/keep-secure/user-rights-assignment.md |    1 -
 ...-monitor-dynamic-access-control-objects.md |    1 -
 .../using-event-viewer-with-applocker.md      |    1 -
 ...riction-policies-and-applocker-policies.md |    1 -
 .../view-the-security-event-log.md            |    1 -
 windows/keep-secure/vpn-profile-options.md    |    9 -
 windows/keep-secure/what-is-applocker.md      |    1 -
 ...ort-advanced-audit-policy-configuration.md |    1 -
 .../why-a-pin-is-better-than-a-password.md    |   11 -
 .../windows-10-mobile-security-guide.md       |   14 +-
 .../keep-secure/windows-10-security-guide.md  |   14 +-
 .../windows-defender-in-windows-10.md         |   10 +-
 ...dows-hello-biometrics-in-the-enterprise.md |    1 -
 .../windows-installer-rules-in-applocker.md   |    1 -
 .../working-with-applocker-policies.md        |    3 +-
 .../working-with-applocker-rules.md           |    1 -
 windows/manage/TOC.md                         |    2 +-
 ...d-unsigned-app-to-code-integrity-policy.md |    3 +-
 .../administrative-tools-in-windows-10.md     |    1 -
 ...gemement-for-windows-store-for-business.md |    1 -
 .../apps-in-the-windows-store-for-business.md |    1 -
 windows/manage/assign-apps-to-employees.md    |    3 +-
 ...istory-for-manage-and-update-windows-10.md |   17 +-
 ...changes-to-start-policies-in-windows-10.md |    7 -
 .../manage/configure-devices-without-mdm.md   |   14 +-
 windows/manage/configure-mdm-provider.md      |    3 +-
 ...onfigure-telemetry-in-your-organization.md |  151 +-
 .../customize-and-export-start-layout.md      |    8 -
 ...-10-start-screens-by-using-group-policy.md |   12 +-
 ...by-using-mobile-device-management--mdm-.md |    3 +-
 ...-by-using-provisioning-packages-and-icd.md |    9 +-
 windows/manage/device-guard-signing-portal.md |    1 -
 ...nnect-your-organization-from-microsoft.md} |    5 +-
 ...distribute-apps-from-your-private-store.md |    1 -
 ...ees-from-the-windows-store-for-business.md |    3 +-
 .../distribute-apps-with-a-management-tool.md |    1 -
 windows/manage/distribute-offline-apps.md     |    1 -
 windows/manage/find-and-acquire-apps.md       |    3 +-
 ...configuration-service-providers--csps--.md |    9 -
 .../images/priv-settings-table-1511.png       |  Bin 16377 -> 0 bytes
 windows/manage/index.md                       |    6 +-
 .../introduction-to-windows-10-servicing.md   |   13 +-
 ...ows-10-mobile-to-azure-active-directory.md |   20 +-
 .../lock-down-windows-10-to-specific-apps.md  |    8 -
 windows/manage/lock-down-windows-10.md        |    7 +-
 windows/manage/lockdown-xml.md                |   12 +-
 .../manage/manage-access-to-private-store.md  |    1 -
 windows/manage/manage-apps.md                 |    1 -
 windows/manage/manage-corporate-devices.md    |   11 +-
 .../manage-cortana-in-your-enterprise.md      |   81 +-
 .../manage/manage-private-store-settings.md   |    1 -
 ...tings-in-the-windows-store-for-business.md |    3 +-
 ...roups-in-the-windows-store-for-business.md |    3 +-
 .../manage-wi-fi-sense-in-your-company.md     |    5 +-
 windows/manage/new-policies-for-windows-10.md |    3 +-
 windows/manage/placeholder.md                 |    1 -
 ...quisites-for-windows-store-for-business.md |    1 -
 .../product-ids-in-windows-10-mobile.md       |    7 -
 .../reset-a-windows-10-mobile-device.md       |    7 -
 ...sions-in-the-windows-store-for-business.md |    3 +-
 .../set-up-a-device-for-anyone-to-use.md      |    3 +-
 ...osk-for-windows-10-for-desktop-editions.md |   12 +-
 ...kiosk-for-windows-10-for-mobile-edition.md |    9 +-
 ...s-reference--windows-store-for-business.md |    6 +-
 .../settings-that-can-be-locked-down.md       |    1 -
 ...egrity-policy-with-device-guard-signing.md |    1 -
 windows/manage/sign-up-and-get-started.md     |    3 +-
 .../sign-up-for-windows-store-for-business.md |    3 +-
 ...-employees-from-using-the-windows-store.md |    3 +-
 windows/manage/troubleshoot.md                |    1 -
 ...ws-store-for-business-account-settings-.md |    3 +-
 windows/manage/windows-10-mobile-and-mdm.md   |   11 -
 ...ws-10-start-layout-options-and-policies.md |    1 -
 windows/manage/windows-store-for-business.md  |    3 +-
 .../working-with-line-of-business-apps.md     |    5 +-
 .../plan/act-community-ratings-and-process.md |    1 -
 windows/plan/act-database-configuration.md    |    1 -
 windows/plan/act-database-migration.md        |    1 -
 windows/plan/act-deployment-options.md        |    3 +-
 windows/plan/act-glossary.md                  |    1 -
 windows/plan/act-lps-share-permissions.md     |    3 +-
 ...act-product-and-documentation-resources.md |    1 -
 .../plan/act-tools-packages-and-services.md   |    3 +-
 windows/plan/act-user-interface-reference.md  |    3 +-
 .../activating-and-closing-windows-in-acm.md  |    1 -
 windows/plan/adding-or-editing-a-solution.md  |    3 +-
 windows/plan/adding-or-editing-an-issue.md    |    3 +-
 .../plan/analyzing-your-compatibility-data.md |    1 -
 ...ility-toolkit--act--technical-reference.md |    3 +-
 windows/plan/application-dialog-box.md        |    3 +-
 ...pplying-filters-to-data-in-the-sua-tool.md |    3 +-
 ...perators-in-compatibility-administrator.md |    3 +-
 ...ctice-recommendations-for-windows-to-go.md |    3 +-
 .../categorizing-your-compatibility-data.md   |    1 -
 ...tory-for-plan-for-windows-10-deployment.md |    1 -
 windows/plan/chromebook-migration-guide.md    |   24 +-
 windows/plan/common-compatibility-issues.md   |    1 -
 ...compatibility-administrator-users-guide.md |    1 -
 ...se-management-strategies-and-deployment.md |    1 -
 ...r-windows-8-windows-7-and-windows-vista.md |    3 +-
 .../plan/compatibility-monitor-users-guide.md |    1 -
 windows/plan/computer-dialog-box.md           |    3 +-
 windows/plan/configuring-act.md               |    1 -
 ...lity-fix-in-compatibility-administrator.md |    8 -
 ...ity-mode-in-compatibility-administrator.md |   10 +-
 .../creating-a-runtime-analysis-package.md    |    5 +-
 ...-message-in-compatibility-administrator.md |   11 +-
 ...e-environment-for-compatibility-testing.md |    9 -
 ...creating-an-inventory-collector-package.md |    5 +-
 ...eating-and-editing-issues-and-solutions.md |    3 +-
 windows/plan/customizing-your-report-views.md |    1 -
 ...gh-the-microsoft-compatibility-exchange.md |    3 +-
 ...x-an-application-or-deploy-a-workaround.md |    1 -
 .../deciding-which-applications-to-test.md    |    3 +-
 .../deleting-a-data-collection-package.md     |    5 +-
 .../deploying-a-runtime-analysis-package.md   |    5 +-
 ...eploying-an-inventory-collector-package.md |    3 +-
 ...oyment-considerations-for-windows-to-go.md |    3 +-
 windows/plan/device-dialog-box.md             |    3 +-
 ...ty-fixes-in-compatibility-administrator.md |    1 -
 windows/plan/example-filter-queries.md        |    3 +-
 .../exporting-a-data-collection-package.md    |    5 +-
 .../plan/filtering-your-compatibility-data.md |    3 +-
 ...xing-applications-by-using-the-sua-tool.md |    3 +-
 windows/plan/fixing-compatibility-issues.md   |    3 +-
 .../guidance-for-education-environments.md    |    3 +-
 ...ying-computers-for-inventory-collection.md |   10 -
 windows/plan/index.md                         |    5 +-
 ...atabases-in-compatibility-administrator.md |    3 +-
 .../integration-with-management-solutions-.md |   10 +-
 .../internet-explorer---web-site-report.md    |    3 +-
 windows/plan/labeling-data-in-acm.md          |    1 -
 ...-locations-for-data-collection-packages.md |    3 +-
 ...tibility-fixes-and-custom-fix-databases.md |    5 +-
 .../managing-your-data-collection-packages.md |    5 +-
 .../operatingsystem---application-report.md   |    3 +-
 .../plan/operatingsystem---computer-report.md |    3 +-
 .../plan/operatingsystem---device-report.md   |    3 +-
 ...ganizational-tasks-for-each-report-type.md |    1 -
 .../organizing-your-compatibility-data.md     |    3 +-
 windows/plan/placeholder.md                   |    1 -
 ...are-your-organization-for-windows-to-go.md |   15 +-
 .../prioritizing-your-compatibility-data.md   |    1 -
 windows/plan/ratings-icons-in-acm.md          |    3 +-
 windows/plan/resolving-an-issue.md            |    1 -
 .../saving-opening-and-exporting-reports.md   |    5 +-
 ...ications-in-compatibility-administrator.md |    3 +-
 ...ery-tool-in-compatibility-administrator.md |   10 -
 ...ection-considerations-for-windows-to-go.md |   13 +-
 ...d-and-receive-status-for-an-application.md |    3 +-
 .../selecting-your-compatibility-rating.md    |    3 +-
 .../plan/selecting-your-deployment-status.md  |    3 +-
 ...ending-and-receiving-compatibility-data.md |    3 +-
 .../settings-dialog-box---preferences-tab.md  |    5 +-
 .../settings-dialog-box---settings-tab.md     |    5 +-
 windows/plan/settings-for-acm.md              |    1 -
 windows/plan/setup-and-deployment.md          |   11 -
 ...wing-messages-generated-by-the-sua-tool.md |    3 +-
 windows/plan/software-requirements-for-act.md |    1 -
 windows/plan/software-requirements-for-rap.md |    3 +-
 windows/plan/sua-users-guide.md               |    1 -
 .../plan/tabs-on-the-sua-tool-interface.md    |    1 -
 .../taking-inventory-of-your-organization.md  |    1 -
 ...ng-compatibility-on-the-target-platform.md |    3 +-
 ...ng-your-application-mitigation-packages.md |    3 +-
 windows/plan/toolbar-icons-in-acm-win-8.md    |    1 -
 .../troubleshooting-act-database-issues.md    |    9 -
 windows/plan/troubleshooting-act.md           |    1 -
 ...leshooting-the-act-configuration-wizard.md |    3 +-
 ...shooting-the-act-log-processing-service.md |   10 -
 ...rstanding-and-using-compatibility-fixes.md |    3 +-
 windows/plan/using-act.md                     |    1 -
 ...-compatibility-monitor-to-send-feedback.md |    3 +-
 ...ng-the-compatibility-administrator-tool.md |    1 -
 .../using-the-sdbinstexe-command-line-tool.md |    5 +-
 windows/plan/using-the-sua-tool.md            |    3 +-
 windows/plan/using-the-sua-wizard.md          |    3 +-
 ...s-screen-in-compatibility-administrator.md |    3 +-
 .../viewing-your-compatibility-reports.md     |    1 -
 windows/plan/websiteurl-dialog-box.md         |    3 +-
 windows/plan/welcome-to-act.md                |    3 +-
 windows/plan/whats-new-in-act-60.md           |    1 -
 windows/plan/windows-10-compatibility.md      |    8 +-
 .../windows-10-deployment-considerations.md   |   10 +-
 .../windows-10-infrastructure-requirements.md |    9 -
 windows/plan/windows-10-servicing-model.md    |   11 -
 ...windows-to-go-feature-overview-scenario.md |    5 +-
 ...indows-to-go-frequently-asked-questions.md |    3 +-
 windows/plan/windows-update-for-business.md   |    9 -
 windows/whats-new/TOC.md                      |    4 +-
 windows/whats-new/applocker.md                |    3 +-
 windows/whats-new/bitlocker.md                |    3 +-
 .../business-store-for-windows-10.md          |    3 +-
 ...ge-history-for-what-s-new-in-windows-10.md |    5 +-
 windows/whats-new/credential-guard.md         |    3 +-
 windows/whats-new/device-guard-overview.md    |    5 +-
 windows/whats-new/device-management.md        |    3 +-
 .../enterprise-data-protection-overview.md    |    3 +-
 windows/whats-new/index.md                    |   12 +-
 ...8-1.md => lockdown-features-windows-10.md} |    3 +-
 ...microsoft-edge-and-internet-explorer-11.md |    1 -
 windows/whats-new/microsoft-passport.md       |    3 +-
 ...pgrade.md => new-provisioning-packages.md} |    3 +-
 windows/whats-new/placeholder.md              |    1 -
 windows/whats-new/security-auditing.md        |    1 -
 windows/whats-new/security.md                 |    9 -
 windows/whats-new/trusted-platform-module.md  |    1 -
 windows/whats-new/user-account-control.md     |    3 +-
 windows/whats-new/windows-spotlight.md        |    8 -
 .../whats-new/windows-update-for-busines.md   |    3 +-
 736 files changed, 2316 insertions(+), 5430 deletions(-)
 rename windows/deploy/{activate-by-proxy-an-active-directory-forest.md => activate-forest-by-proxy-vamt.md} (98%)
 rename windows/deploy/{activate-an-active-directory-forest-online.md => activate-forest-vamt.md} (92%)
 rename windows/deploy/{activate-using-key-management-service-client.md => activate-using-key-management-service-vamt.md} (98%)
 rename windows/deploy/{activate-clients-running-windows-81-client.md => activate-windows-10-clients-vamt.md} (98%)
 rename windows/deploy/{add-and-manage-products-vamt-30-win8.md => add-manage-products-vamt.md} (80%)
 rename windows/deploy/{add-and-remove-computers-vamt-30-win8.md => add-remove-computers-vamt.md} (97%)
 rename windows/deploy/{add-and-remove-a-product-key-vamt-30-win8.md => add-remove-product-key-vamt.md} (95%)
 rename windows/deploy/{configure-client-computers-vamt-30-win8.md => configure-client-computers-vamt.md} (98%)
 rename windows/deploy/{import-and-export-vamt-data-vamt-30-win8.md => import-export-vamt-data.md} (96%)
 rename windows/deploy/{install-and-configure-vamt-vamt-30-win8.md => install-configure-vamt.md} (75%)
 rename windows/deploy/{install-a-kms-client-key-vamt-30-win8.md => install-kms-client-key-vamt.md} (96%)
 rename windows/deploy/{install-a-product-key-vamt-30-win8.md => install-product-key-vamt.md} (96%)
 rename windows/deploy/{install-vamt-vamt-30-win8.md => install-vamt.md} (96%)
 rename windows/deploy/{introduction-to-vamtvamt-30-win8.md => introduction-vamt.md} (98%)
 rename windows/deploy/{perform-kms-activation-vamt-30-win8.md => kms-activation-vamt.md} (96%)
 rename windows/deploy/{perform-local-reactivation-vamt-30-win8.md => local-reactivation-vamt.md} (97%)
 rename windows/deploy/{manage-activations-vamt-30-win8.md => manage-activations-vamt.md} (72%)
 rename windows/deploy/{manage-product-keys-vamt-30-win8.md => manage-product-keys-vamt.md} (73%)
 rename windows/deploy/{manage-vamt-data-vamt-30-win8.md => manage-vamt-data.md} (86%)
 rename windows/deploy/{perform-online-activation-vamt-30-win8.md => online-activation-vamt.md} (97%)
 delete mode 100644 windows/deploy/placeholder.md
 rename windows/deploy/{perform-proxy-activation-vamt-30-win8.md => proxy-activation-vamt.md} (87%)
 rename windows/deploy/{remove-products-vamt-30-win8.md => remove-products-vamt.md} (93%)
 rename windows/deploy/{scenario-3-kms-client-activation-vamt-30-win8.md => scenario-kms-activation-vamt.md} (92%)
 rename windows/deploy/{scenario-1-online-activation-vamt-30-win8.md => scenario-online-activation-vamt.md} (98%)
 rename windows/deploy/{scenario-2-proxy-activation-vamt-30-win8.md => scenario-proxy-activation-vamt.md} (98%)
 rename windows/deploy/{update-product-status-vamt-30-win8.md => update-product-status-vamt.md} (94%)
 rename windows/deploy/{vamt-known-issues-vamt-30-win8.md => vamt-known-issues.md} (97%)
 rename windows/deploy/{vamt-requirements-vamt-30-win8.md => vamt-requirements.md} (95%)
 rename windows/deploy/{vamt-step-by-step-scenarios-vamt-30-win8.md => vamt-step-by-step.md} (78%)
 rename windows/deploy/{volume-activation-management-tool--vamt--overview-vamt-30-win8.md => volume-activation-management-tool.md} (82%)
 rename windows/deploy/{volume-activation-for-windows-81-client.md => volume-activation-windows-10.md} (95%)
 rename windows/keep-secure/{microsoft-passport-event-id-200.md => passport-event-300.md} (97%)
 delete mode 100644 windows/keep-secure/placeholder.md
 rename windows/manage/{manage-privacy-for-windows-10-in-your-company.md => disconnect-your-organization-from-microsoft.md} (99%)
 delete mode 100644 windows/manage/images/priv-settings-table-1511.png
 delete mode 100644 windows/manage/placeholder.md
 delete mode 100644 windows/plan/placeholder.md
 rename windows/whats-new/{lockdown-features-from-windows-embedded-industry-8-1.md => lockdown-features-windows-10.md} (98%)
 rename windows/whats-new/{provisioning-and-upgrade.md => new-provisioning-packages.md} (95%)
 delete mode 100644 windows/whats-new/placeholder.md

diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md
index 4ffbb4e95d..8403bb44b3 100644
--- a/windows/deploy/TOC.md
+++ b/windows/deploy/TOC.md
@@ -39,47 +39,47 @@
 ## [Deploy Windows To Go in your organization](deploy-windows-to-go-in-your-organization-small-scenario.md)
 ## [Update Windows 10 images with provisioning packages](update-windows-10-images-with-provisioning-packages.md)
 ## [Sideload apps in Windows 10](sideload-apps-in-windows-10.md)
-## [Volume Activation [client]](volume-activation-for-windows-81-client.md)
+## [Volume Activation [client]](volume-activation-windows-10.md)
 ### [Plan for volume activation [client]](plan-for-volume-activation-client.md)
-### [Activate using Key Management Service [client]](activate-using-key-management-service-client.md)
+### [Activate using Key Management Service [client]](activate-using-key-management-service-vamt.md)
 ### [Activate using Active Directory-based activation [client]](activate-using-active-directory-based-activation-client.md)
-### [Activate clients running Windows 10](activate-clients-running-windows-81-client.md)
+### [Activate clients running Windows 10](activate-windows-10-clients-vamt.md)
 ### [Monitor activation [client]](monitor-activation-client.md)
 ### [Use the Volume Activation Management Tool [client]](use-the-volume-activation-management-tool-client.md)
 ### [Appendix: Information sent to Microsoft during activation [client]](appendix-information-sent-to-microsoft-during-activation-client.md)
 ## [Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md)
 ### [Windows 10 deployment tools](windows-deployment-scenarios-and-tools.md)
 ### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)
-### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool--vamt--overview-vamt-30-win8.md)
-#### [Introduction to VAMT](introduction-to-vamtvamt-30-win8.md)
+### [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool.md)
+#### [Introduction to VAMT](introduction-vamt.md)
 #### [Active Directory-Based Activation Overview](active-directory-based-activation-overview.md)
-#### [Install and Configure VAMT](install-and-configure-vamt-vamt-30-win8.md)
-##### [VAMT Requirements](vamt-requirements-vamt-30-win8.md)
-##### [Install VAMT](install-vamt-vamt-30-win8.md)
-##### [Configure Client Computers](configure-client-computers-vamt-30-win8.md)
-#### [Add and Manage Products](add-and-manage-products-vamt-30-win8.md)
-##### [Add and Remove Computers](add-and-remove-computers-vamt-30-win8.md)
-##### [Update Product Status](update-product-status-vamt-30-win8.md)
-##### [Remove Products](remove-products-vamt-30-win8.md)
-#### [Manage Product Keys](manage-product-keys-vamt-30-win8.md)
-##### [Add and Remove a Product Key](add-and-remove-a-product-key-vamt-30-win8.md)
-##### [Install a Product Key](install-a-product-key-vamt-30-win8.md)
-##### [Install a KMS Client Key](install-a-kms-client-key-vamt-30-win8.md)
-#### [Manage Activations](manage-activations-vamt-30-win8.md)
-##### [Perform Online Activation](perform-online-activation-vamt-30-win8.md)
-##### [Perform Proxy Activation](perform-proxy-activation-vamt-30-win8.md)
-##### [Perform KMS Activation](perform-kms-activation-vamt-30-win8.md)
-##### [Perform Local Reactivation](perform-local-reactivation-vamt-30-win8.md)
-##### [Activate an Active Directory Forest Online](activate-an-active-directory-forest-online.md)
-##### [Activate by Proxy an Active Directory Forest](activate-by-proxy-an-active-directory-forest.md)
-#### [Manage VAMT Data](manage-vamt-data-vamt-30-win8.md)
-##### [Import and Export VAMT Data](import-and-export-vamt-data-vamt-30-win8.md)
+#### [Install and Configure VAMT](install-configure-vamt.md)
+##### [VAMT Requirements](vamt-requirements.md)
+##### [Install VAMT](install-vamt.md)
+##### [Configure Client Computers](configure-client-computers-vamt.md)
+#### [Add and Manage Products](add-manage-products-vamt.md)
+##### [Add and Remove Computers](add-remove-computers-vamt.md)
+##### [Update Product Status](update-product-status-vamt.md)
+##### [Remove Products](remove-products-vamt.md)
+#### [Manage Product Keys](manage-product-keys-vamt.md)
+##### [Add and Remove a Product Key](add-remove-product-key-vamt.md)
+##### [Install a Product Key](install-product-key-vamt.md)
+##### [Install a KMS Client Key](install-kms-client-key-vamt.md)
+#### [Manage Activations](manage-activations-vamt.md)
+##### [Perform Online Activation](online-activation-vamt.md)
+##### [Perform Proxy Activation](proxy-activation-vamt.md)
+##### [Perform KMS Activation](kms-activation-vamt.md)
+##### [Perform Local Reactivation](local-reactivation-vamt.md)
+##### [Activate an Active Directory Forest Online](activate-forest-vamt.md)
+##### [Activate by Proxy an Active Directory Forest](activate-forest-by-proxy-vamt.md)
+#### [Manage VAMT Data](manage-vamt-data.md)
+##### [Import and Export VAMT Data](import-export-vamt-data.md)
 ##### [Use VAMT in Windows PowerShell](use-vamt-in-windows-powershell.md)
-#### [VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)
-##### [Scenario 1: Online Activation](scenario-1-online-activation-vamt-30-win8.md)
-##### [Scenario 2: Proxy Activation](scenario-2-proxy-activation-vamt-30-win8.md)
-##### [Scenario 3: KMS Client Activation](scenario-3-kms-client-activation-vamt-30-win8.md)
-#### [VAMT Known Issues](vamt-known-issues-vamt-30-win8.md)
+#### [VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
+##### [Scenario 1: Online Activation](scenario-online-activation-vamt.md)
+##### [Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md)
+##### [Scenario 3: KMS Client Activation](scenario-kms-activation-vamt.md)
+#### [VAMT Known Issues](vamt-known-issues.md)
 ### [User State Migration Tool (USMT) Technical Reference](user-state-migration-tool--usmt--technical-reference.md)
 #### [User State Migration Tool (USMT) Overview Topics](user-state-migration-tool--usmt--overview-topics.md)
 ##### [User State Migration Tool (USMT) Overview](user-state-migration-tool--usmt--overview.md)
diff --git a/windows/deploy/activate-by-proxy-an-active-directory-forest.md b/windows/deploy/activate-forest-by-proxy-vamt.md
similarity index 98%
rename from windows/deploy/activate-by-proxy-an-active-directory-forest.md
rename to windows/deploy/activate-forest-by-proxy-vamt.md
index c39ab75b98..45eff24a72 100644
--- a/windows/deploy/activate-by-proxy-an-active-directory-forest.md
+++ b/windows/deploy/activate-forest-by-proxy-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Activate by Proxy an Active Directory Forest (Windows 10)
 description: Activate by Proxy an Active Directory Forest
-MSHAttr: PreferredLib /library
 ms.assetid: 6475fc87-a6f7-4fa8-b0aa-de19f2dea7e5
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -77,7 +76,7 @@ VAMT displays the **Activating Active Directory** dialog box until it completes
 ## Related topics
 
 
-[Add and Remove Computers](add-and-remove-computers-vamt-30-win8.md)
+[Add and Remove Computers](add-remove-computers-vamt.md)
 
  
 
diff --git a/windows/deploy/activate-an-active-directory-forest-online.md b/windows/deploy/activate-forest-vamt.md
similarity index 92%
rename from windows/deploy/activate-an-active-directory-forest-online.md
rename to windows/deploy/activate-forest-vamt.md
index bb98c7c2b4..b6b91a3e45 100644
--- a/windows/deploy/activate-an-active-directory-forest-online.md
+++ b/windows/deploy/activate-forest-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Activate an Active Directory Forest Online (Windows 10)
 description: Activate an Active Directory Forest Online
-MSHAttr: PreferredLib /library
 ms.assetid: 9b5bc193-799b-4aa5-9d3e-0e495f7195d3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -56,9 +55,9 @@ The activated object and the date that is was created appear in the **Active Dir
 ## Related topics
 
 
-[Scenario 1: Online Activation](scenario-1-online-activation-vamt-30-win8.md)
+[Scenario 1: Online Activation](scenario-online-activation-vamt.md)
 
-[Add and Remove Computers](add-and-remove-computers-vamt-30-win8.md)
+[Add and Remove Computers](add-remove-computers-vamt.md)
 
  
 
diff --git a/windows/deploy/activate-using-active-directory-based-activation-client.md b/windows/deploy/activate-using-active-directory-based-activation-client.md
index be0d399d53..a874923ed7 100644
--- a/windows/deploy/activate-using-active-directory-based-activation-client.md
+++ b/windows/deploy/activate-using-active-directory-based-activation-client.md
@@ -1,7 +1,6 @@
 ---
-title: Activate using Active Directory based activation (Windows 10)
-description: Active Directory based activation is implemented as a role service that relies on AD DS to store activation objects.
-MSHAttr: PreferredLib /library
+title: Activate using Active Directory-based activation (Windows 10)
+description: Active Directory-based activation is implemented as a role service that relies on AD DS to store activation objects.
 ms.assetid: 08cce6b7-7b5b-42cf-b100-66c363a846af
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
 ms.prod: W10
@@ -128,7 +127,7 @@ If you are using both KMS and Active Directory-based activation, it may be diffi
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/activate-using-key-management-service-client.md b/windows/deploy/activate-using-key-management-service-vamt.md
similarity index 98%
rename from windows/deploy/activate-using-key-management-service-client.md
rename to windows/deploy/activate-using-key-management-service-vamt.md
index 956abb4973..efcdc400de 100644
--- a/windows/deploy/activate-using-key-management-service-client.md
+++ b/windows/deploy/activate-using-key-management-service-vamt.md
@@ -1,6 +1,5 @@
 ---
 title: Activate using Key Management Service (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: f2417bfe-7d25-4e82-bc07-de316caa8dac
 description: 
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
@@ -164,7 +163,7 @@ For detailed instructions, see [Update that enables Windows 8.1 and Windows 8 KM
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/activate-clients-running-windows-81-client.md b/windows/deploy/activate-windows-10-clients-vamt.md
similarity index 98%
rename from windows/deploy/activate-clients-running-windows-81-client.md
rename to windows/deploy/activate-windows-10-clients-vamt.md
index f961775e3a..fefa63880f 100644
--- a/windows/deploy/activate-clients-running-windows-81-client.md
+++ b/windows/deploy/activate-windows-10-clients-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Activate clients running Windows 10 (Windows 10)
-description: After you have configured Key Management Service (KMS) or Active Directory based activation on your network activating a client running Windows 10 is easy.
-MSHAttr: PreferredLib /library
+description: After you have configured Key Management Service (KMS) or Active Directory-based activation on your network, activating a client running Windows 10 is easy.
 ms.assetid: 39446e49-ad7c-48dc-9f18-f85a11ded643
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
 ms.prod: W10
@@ -135,7 +134,7 @@ Windows 10, Windows 8.1, Windows 8, Windows 7, Windows Server 2012 R2, Wind
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/active-directory-based-activation-overview.md b/windows/deploy/active-directory-based-activation-overview.md
index 27b21b1a95..832ac0f3e9 100644
--- a/windows/deploy/active-directory-based-activation-overview.md
+++ b/windows/deploy/active-directory-based-activation-overview.md
@@ -1,7 +1,6 @@
 ---
-title: Active Directory Based Activation Overview (Windows 10)
-description: Active Directory Based Activation Overview
-MSHAttr: PreferredLib /library
+title: Active Directory-Based Activation Overview (Windows 10)
+description: Active Directory-Based Activation Overview
 ms.assetid: c1dac3bd-6a86-4c45-83dd-421e63a398c0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/add-a-windows-81-operating-system-image-using-configuration-manager.md b/windows/deploy/add-a-windows-81-operating-system-image-using-configuration-manager.md
index 8a4f737d9e..9bb36dd722 100644
--- a/windows/deploy/add-a-windows-81-operating-system-image-using-configuration-manager.md
+++ b/windows/deploy/add-a-windows-81-operating-system-image-using-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Add a Windows 10 operating system image using Configuration Manager (Windows 10)
 description: Operating system images are typically the production image used for deployment throughout the organization.
-MSHAttr: PreferredLib /library
 ms.assetid: 77f769cc-1a47-4f36-8082-201cd77b8d3b
-keywords: ["image deploy distribute"]
+keywords: ["image, deploy, distribute"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/add-drivers-to-a-windows-81-deployment-with-windows-pe-using-configuration-manager.md b/windows/deploy/add-drivers-to-a-windows-81-deployment-with-windows-pe-using-configuration-manager.md
index 0d38880af4..65b54344fe 100644
--- a/windows/deploy/add-drivers-to-a-windows-81-deployment-with-windows-pe-using-configuration-manager.md
+++ b/windows/deploy/add-drivers-to-a-windows-81-deployment-with-windows-pe-using-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager (Windows 10)
-description: In this topic you will learn how to configure the Windows Preinstallation Environment (Windows PE) to include the network drivers required to connect to the deployment share and the storage drivers required to see the local storage on machines.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to configure the Windows Preinstallation Environment (Windows PE) to include the network drivers required to connect to the deployment share and the storage drivers required to see the local storage on machines.
 ms.assetid: 97b3ea46-28d9-407e-8c42-ded2e45e8d5c
-keywords: ["deploy task sequence"]
+keywords: ["deploy, task sequence"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,12 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Add drivers for Windows PE](#sec01)
--   [Add drivers for Windows 10](#sec02)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to configure the Windows Preinstallation Environment (Windows PE) to include the network drivers required to connect to the deployment share and the storage drivers required to see the local storage on machines. Even though the Windows PE boot image and the Windows 10 operating system contain many out-of-the-box drivers, it is likely you will have to add new or updated drivers to support all your hardware. In this section, you import drivers for both Windows PE and the full Windows 10 operating system.
 
 For the purposes of this topic, we will use CM01, a machine running Windows Server 2012 R2 Standard that is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/add-and-manage-products-vamt-30-win8.md b/windows/deploy/add-manage-products-vamt.md
similarity index 80%
rename from windows/deploy/add-and-manage-products-vamt-30-win8.md
rename to windows/deploy/add-manage-products-vamt.md
index d0632f11e4..9879f43331 100644
--- a/windows/deploy/add-and-manage-products-vamt-30-win8.md
+++ b/windows/deploy/add-manage-products-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Add and Manage Products (Windows 10)
 description: Add and Manage Products
-MSHAttr: PreferredLib /library
 ms.assetid: a48fbc23-917d-40f7-985c-e49702c05e51
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,15 +23,15 @@ This section describes how to add client computers into the Volume Activation Ma
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Add and Remove Computers](add-and-remove-computers-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Add and Remove Computers](add-remove-computers-vamt.md)</p></td>
 <td align="left"><p>Describes how to add client computers to VAMT.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Update Product Status](update-product-status-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Update Product Status](update-product-status-vamt.md)</p></td>
 <td align="left"><p>Describes how to update the status of product license.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Remove Products](remove-products-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Remove Products](remove-products-vamt.md)</p></td>
 <td align="left"><p>Describes how to remove a product from the product list.</p></td>
 </tr>
 </tbody>
diff --git a/windows/deploy/add-and-remove-computers-vamt-30-win8.md b/windows/deploy/add-remove-computers-vamt.md
similarity index 97%
rename from windows/deploy/add-and-remove-computers-vamt-30-win8.md
rename to windows/deploy/add-remove-computers-vamt.md
index 7053a314fb..536e2c4bd2 100644
--- a/windows/deploy/add-and-remove-computers-vamt-30-win8.md
+++ b/windows/deploy/add-remove-computers-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Add and Remove Computers (Windows 10)
 description: Add and Remove Computers
-MSHAttr: PreferredLib /library
 ms.assetid: cb6f3a78-ece0-4dc7-b086-cb003d82cd52
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -14,7 +13,7 @@ author: CFaw
 
 You can add computers that have any of the supported Windows or Office products installed to a Volume Activation Management Tool (VAMT) database by using the **Discover products** function. You can search for computers in an Active Directory domain, by individual computer name or IP address, in a workgroup, or by a general LDAP query. You can remove computers from a VAMT database by using the **Delete** function. After you add the computers, you can add the products that are installed on the computers by running the **Update license status** function.
 
-Before adding computers, ensure that the Windows Management Instrumentation (WMI) firewall exception required by VAMT has been enabled on all target computers. For more information see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+Before adding computers, ensure that the Windows Management Instrumentation (WMI) firewall exception required by VAMT has been enabled on all target computers. For more information see [Configure Client Computers](configure-client-computers-vamt.md).
 
 ## To add computers to a VAMT database
 
@@ -78,7 +77,7 @@ You can delete a computer by clicking on it in the product list view, and then c
 ## Related topics
 
 
-[Add and Manage Products](add-and-manage-products-vamt-30-win8.md)
+[Add and Manage Products](add-manage-products-vamt.md)
 
  
 
diff --git a/windows/deploy/add-and-remove-a-product-key-vamt-30-win8.md b/windows/deploy/add-remove-product-key-vamt.md
similarity index 95%
rename from windows/deploy/add-and-remove-a-product-key-vamt-30-win8.md
rename to windows/deploy/add-remove-product-key-vamt.md
index 448dfa8e52..92933f1c5f 100644
--- a/windows/deploy/add-and-remove-a-product-key-vamt-30-win8.md
+++ b/windows/deploy/add-remove-product-key-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Add and Remove a Product Key (Windows 10)
 description: Add and Remove a Product Key
-MSHAttr: PreferredLib /library
 ms.assetid: feac32bb-fb96-4802-81b8-c69220dcfcce
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -42,7 +41,7 @@ If you are activating a large number of products with a MAK, you should refresh
 ## Related topics
 
 
-[Manage Product Keys](manage-product-keys-vamt-30-win8.md)
+[Manage Product Keys](manage-product-keys-vamt.md)
 
  
 
diff --git a/windows/deploy/appendix-information-sent-to-microsoft-during-activation-client.md b/windows/deploy/appendix-information-sent-to-microsoft-during-activation-client.md
index c35fb39d49..656c87af32 100644
--- a/windows/deploy/appendix-information-sent-to-microsoft-during-activation-client.md
+++ b/windows/deploy/appendix-information-sent-to-microsoft-during-activation-client.md
@@ -1,6 +1,5 @@
 ---
 title: Appendix Information sent to Microsoft during activation (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 4bfff495-07d0-4385-86e3-7a077cbd64b8
 description: 
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
@@ -81,7 +80,7 @@ For additional details, see [Windows 10 Privacy Statement](http://go.microsoft.c
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/assign-applications-using-roles-in-mdt-2013.md b/windows/deploy/assign-applications-using-roles-in-mdt-2013.md
index fb03fb15d2..a726ac91ee 100644
--- a/windows/deploy/assign-applications-using-roles-in-mdt-2013.md
+++ b/windows/deploy/assign-applications-using-roles-in-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Assign applications using roles in MDT (Windows 10)
 description: This topic will show you how to add applications to a role in the MDT database and then assign that role to a computer.
-MSHAttr: PreferredLib /library
 ms.assetid: d82902e4-de9c-4bc4-afe0-41d649b83ce7
-keywords: ["settings database deploy"]
+keywords: ["settings, database, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,13 +12,6 @@ author: CFaw
 # Assign applications using roles in MDT
 
 
-**In this article**
-
--   [Create and assign a role entry in the database](#sec01)
--   [Associate the role with a computer in the database](#sec02)
--   [Verify database access in the MDT simulation environment](#sec03)
--   [Related topics](#related-topics)
-
 This topic will show you how to add applications to a role in the MDT database and then assign that role to a computer. For the purposes of this topic, the application we are adding is Adobe Reader XI. In addition to using computer-specific entries in the database, you can use roles in MDT to group settings together.
 
 ## <a href="" id="sec01"></a>Create and assign a role entry in the database
diff --git a/windows/deploy/build-a-distributed-environment-for-windows-81-deployment.md b/windows/deploy/build-a-distributed-environment-for-windows-81-deployment.md
index 9a9e146e10..8fa27b0329 100644
--- a/windows/deploy/build-a-distributed-environment-for-windows-81-deployment.md
+++ b/windows/deploy/build-a-distributed-environment-for-windows-81-deployment.md
@@ -1,9 +1,8 @@
 ---
 title: Build a distributed environment for Windows 10 deployment (Windows 10)
-description: In this topic you will learn how to replicate your Windows 10 deployment shares to facilitate the deployment of Windows 10 in remote or branch locations.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to replicate your Windows 10 deployment shares to facilitate the deployment of Windows 10 in remote or branch locations.
 ms.assetid: a6cd5657-6a16-4fff-bfb4-44760902d00c
-keywords: ["replication replicate deploy configure remote"]
+keywords: ["replication, replicate, deploy, configure, remote"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,15 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Replicate deployment shares](#sec01)
--   [Set up Distributed File System Replication (DFS-R) for replication](#sec02)
--   [Replicate the content](#sec03)
--   [Configure Windows Deployment Services (WDS) in a remote site](#sec04)
--   [Deploy the Windows 10 client to the remote site](#sec05)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to replicate your Windows 10 deployment shares to facilitate the deployment of Windows 10 in remote or branch locations. If you work in a distributed environment, replicating the deployment shares is an important part of the deployment solution. With images reaching 5 GB in size or more, you can't deploy machines in a remote office over the wire. You need to replicate the content, so that the clients can do local deployments.
 
 We will use four machines for this topic: DC01, MDT01, MDT02, and PC0006. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 standard server, and PC0006 is a blank machine to which you will deploy Windows 10. You will configure a second deployment server (MDT02) for a remote site (Stockholm) by replicating the deployment share in the original site (New York). MDT01, MDT02, and PC0006 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof).
diff --git a/windows/deploy/change-history-for-deploy-windows-10.md b/windows/deploy/change-history-for-deploy-windows-10.md
index 68e3540ec4..ce19bf7be5 100644
--- a/windows/deploy/change-history-for-deploy-windows-10.md
+++ b/windows/deploy/change-history-for-deploy-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Change history for Deploy Windows 10 (Windows 10)
 description: This topic lists new and updated topics in the Deploy Windows 10 documentation for Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: 19C50373-6B25-4F5C-A6EF-643D36904349
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -19,7 +18,7 @@ This topic lists new and updated topics in the [Deploy Windows 10](index.md) doc
 
 | New or changed topic                                                                      | Description |
 |-------------------------------------------------------------------------------------------|-------------|
-| [Activate using Key Management Service](activate-using-key-management-service-client.md) | Updated     |
+| [Activate using Key Management Service](activate-using-key-management-service-vamt.md) | Updated     |
 | [Windows 10 edition upgrade](windows-10-edition-upgrades.md)                             | Updated     |
 
  
diff --git a/windows/deploy/choose-a-migration-store-type-usmt-win7-usmt-win8.md b/windows/deploy/choose-a-migration-store-type-usmt-win7-usmt-win8.md
index e299efdbe1..6d33aa02a8 100644
--- a/windows/deploy/choose-a-migration-store-type-usmt-win7-usmt-win8.md
+++ b/windows/deploy/choose-a-migration-store-type-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Choose a Migration Store Type (Windows 10)
 description: Choose a Migration Store Type
-MSHAttr: PreferredLib /library
 ms.assetid: 4e163e90-9c57-490b-b849-2ed52ab6765f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/common-issues-usmt-win8.md b/windows/deploy/common-issues-usmt-win8.md
index ba52013b1f..a084274da5 100644
--- a/windows/deploy/common-issues-usmt-win8.md
+++ b/windows/deploy/common-issues-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Common Issues (Windows 10)
 description: Common Issues
-MSHAttr: PreferredLib /library
 ms.assetid: 5a37e390-8617-4768-9eee-50397fbbb2e1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/common-migration-scenarios-usmt-win7-usmt-win8.md b/windows/deploy/common-migration-scenarios-usmt-win7-usmt-win8.md
index d46260b28a..117f0e492c 100644
--- a/windows/deploy/common-migration-scenarios-usmt-win7-usmt-win8.md
+++ b/windows/deploy/common-migration-scenarios-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Common Migration Scenarios (Windows 10)
 description: Common Migration Scenarios
-MSHAttr: PreferredLib /library
 ms.assetid: 1d8170d5-e775-4963-b7a5-b55e8987c1e4
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/configure-client-computers-vamt-30-win8.md b/windows/deploy/configure-client-computers-vamt.md
similarity index 98%
rename from windows/deploy/configure-client-computers-vamt-30-win8.md
rename to windows/deploy/configure-client-computers-vamt.md
index 4e52d41870..3f8e818459 100644
--- a/windows/deploy/configure-client-computers-vamt-30-win8.md
+++ b/windows/deploy/configure-client-computers-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Configure Client Computers (Windows 10)
 description: Configure Client Computers
-MSHAttr: PreferredLib /library
 ms.assetid: a48176c9-b05c-4dd5-a9ef-83073e2370fc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -123,7 +122,7 @@ The above configurations will open an additional port through the Windows Firewa
 ## Related topics
 
 
-[Install and Configure VAMT](install-and-configure-vamt-vamt-30-win8.md)
+[Install and Configure VAMT](install-configure-vamt.md)
 
  
 
diff --git a/windows/deploy/configure-mdt-2013-for-userexit-scripts.md b/windows/deploy/configure-mdt-2013-for-userexit-scripts.md
index 18134ed538..eb899ef154 100644
--- a/windows/deploy/configure-mdt-2013-for-userexit-scripts.md
+++ b/windows/deploy/configure-mdt-2013-for-userexit-scripts.md
@@ -1,9 +1,8 @@
 ---
 title: Configure MDT for UserExit scripts (Windows 10)
-description: In this topic you will learn how to configure the MDT rules engine to use a UserExit script to generate computer names based on a prefix and the computer MAC Address.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to configure the MDT rules engine to use a UserExit script to generate computer names based on a prefix and the computer MAC Address.
 ms.assetid: 29a421d1-12d2-414e-86dc-25b62f5238a7
-keywords: ["rules script"]
+keywords: ["rules, script"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,12 +12,6 @@ author: CFaw
 # Configure MDT for UserExit scripts
 
 
-**In this article**
-
--   [Configure the rules to call a UserExit script](#configure-the-rules-to-call-a-userexit-script)
--   [The Setname.vbs UserExit script](#the-setname-vbs-userexit-script)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to configure the MDT rules engine to use a UserExit script to generate computer names based on a prefix and the computer MAC Address. MDT supports calling external VBScripts as part of the Gather process; these scripts are referred to as UserExit scripts. The script also removes the colons in the MAC Address.
 
 ## Configure the rules to call a UserExit script
diff --git a/windows/deploy/configure-mdt-2013-settings.md b/windows/deploy/configure-mdt-2013-settings.md
index 1e6695f819..f9c6a2b85c 100644
--- a/windows/deploy/configure-mdt-2013-settings.md
+++ b/windows/deploy/configure-mdt-2013-settings.md
@@ -1,9 +1,8 @@
 ---
 title: Configure MDT settings (Windows 10)
 description: One of the most powerful features in Microsoft Deployment Toolkit (MDT) 2013 is its extension capabilities; there is virtually no limitation to what you can do in terms of customization.
-MSHAttr: PreferredLib /library
 ms.assetid: d3e1280c-3d1b-4fad-8ac4-b65dc711f122
-keywords: ["customize customization deploy features tools"]
+keywords: ["customize, customization, deploy, features, tools"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/configure-mdt-deployment-share-rules.md b/windows/deploy/configure-mdt-deployment-share-rules.md
index f36040ec75..8f21637563 100644
--- a/windows/deploy/configure-mdt-deployment-share-rules.md
+++ b/windows/deploy/configure-mdt-deployment-share-rules.md
@@ -1,9 +1,8 @@
 ---
 title: Configure MDT deployment share rules (Windows 10)
-description: In this topic you will learn how to configure the MDT rules engine to reach out to other resources including external scripts databases and web services for additional information instead of storing settings directly in the rules engine.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to configure the MDT rules engine to reach out to other resources, including external scripts, databases, and web services, for additional information instead of storing settings directly in the rules engine.
 ms.assetid: b5ce2360-33cc-4b14-b291-16f75797391b
-keywords: ["rules configuration automate deploy"]
+keywords: ["rules, configuration, automate, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,12 +12,6 @@ author: CFaw
 # Configure MDT deployment share rules
 
 
-**In this article**
-
--   [Assign settings](#sec01)
--   [Sample configurations](#sec02)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to configure the MDT rules engine to reach out to other resources, including external scripts, databases, and web services, for additional information instead of storing settings directly in the rules engine. The rules engine in MDT is powerful: most of the settings used for operating system deployments are retrieved and assigned via the rules engine. In its simplest form, the rules engine is the CustomSettings.ini text file.
 
 ## <a href="" id="sec01"></a>Assign settings
diff --git a/windows/deploy/configxml-file-usmt-win7-usmt-win8.md b/windows/deploy/configxml-file-usmt-win7-usmt-win8.md
index ae4dd848d0..4620637f55 100644
--- a/windows/deploy/configxml-file-usmt-win7-usmt-win8.md
+++ b/windows/deploy/configxml-file-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Config.xml File (Windows 10)
 description: Config.xml File
-MSHAttr: PreferredLib /library
 ms.assetid: 9dc98e76-5155-4641-bcb3-81915db538e8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/conflicts-and-precedence-usmt-win7-usmt-win8.md b/windows/deploy/conflicts-and-precedence-usmt-win7-usmt-win8.md
index be948d39b8..812254b16e 100644
--- a/windows/deploy/conflicts-and-precedence-usmt-win7-usmt-win8.md
+++ b/windows/deploy/conflicts-and-precedence-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Conflicts and Precedence (Windows 10)
 description: Conflicts and Precedence
-MSHAttr: PreferredLib /library
 ms.assetid: 0e2691a8-ff1e-4424-879b-4d5a2f8a113a
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/create-a-custom-windows-pe-50-boot-image-with-configuration-manager.md b/windows/deploy/create-a-custom-windows-pe-50-boot-image-with-configuration-manager.md
index 630587134e..60731018d3 100644
--- a/windows/deploy/create-a-custom-windows-pe-50-boot-image-with-configuration-manager.md
+++ b/windows/deploy/create-a-custom-windows-pe-50-boot-image-with-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Create a custom Windows PE boot image with Configuration Manager (Windows 10)
-description: In Microsoft System Center 2012 R2 Configuration Manager you can create custom Windows Preinstallation Environment (Windows PE) boot images that include extra components and features.
-MSHAttr: PreferredLib /library
+description: In Microsoft System Center 2012 R2 Configuration Manager, you can create custom Windows Preinstallation Environment (Windows PE) boot images that include extra components and features.
 ms.assetid: b9e96974-324d-4fa4-b0ce-33cfc49c4809
-keywords: ["tool customize deploy boot image"]
+keywords: ["tool, customize, deploy, boot image"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,12 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Add DaRT 10 files and prepare to brand the boot image](#sec01)
--   [Create a boot image for Configuration Manager using the MDT wizard](#sec02)
--   [Related topics](#related-topics)
-
 In Microsoft System Center 2012 R2 Configuration Manager, you can create custom Windows Preinstallation Environment (Windows PE) boot images that include extra components and features. This topic shows you how to create a custom Windows PE 5.0 boot image with the Microsoft Deployment Toolkit (MDT) 2013 Update 1 wizard. You can also add the Microsoft Diagnostics and Recovery Toolset (DaRT) 10 to the boot image as part of the boot image creation process.
 
 For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md b/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md
index e9362ea6a3..d2bdda4345 100644
--- a/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md
+++ b/windows/deploy/create-a-task-sequence-with-configuration-manager-and-mdt.md
@@ -1,9 +1,8 @@
 ---
 title: Create a task sequence with Configuration Manager and MDT (Windows 10)
-description: In this topic you will learn how to create a Microsoft System Center 2012 R2 Configuration Manager task sequence with Microsoft Deployment Toolkit (MDT) integration using the MDT wizard.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to create a Microsoft System Center 2012 R2 Configuration Manager task sequence with Microsoft Deployment Toolkit (MDT) integration using the MDT wizard.
 ms.assetid: 0b069bec-5be8-47c6-bf64-7a630f41ac98
-keywords: ["deploy upgrade task sequence install"]
+keywords: ["deploy, upgrade, task sequence, install"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,13 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Create a task sequence using the MDT Integration Wizard](#sec01)
--   [Edit the task sequence](#sec02)
--   [Move the packages](#sec03)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to create a Microsoft System Center 2012 R2 Configuration Manager task sequence with Microsoft Deployment Toolkit (MDT) integration using the MDT wizard. Creating task sequences in System Center 2012 R2 Configuration Manager requires many more steps than creating task sequences for MDT Lite Touch installation. Luckily, the MDT wizard helps you through the process and also guides you through creating the needed packages.
 
 For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard, both of which are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/create-a-windows-81-reference-image.md b/windows/deploy/create-a-windows-81-reference-image.md
index 8feb06e9bb..494afe5ad2 100644
--- a/windows/deploy/create-a-windows-81-reference-image.md
+++ b/windows/deploy/create-a-windows-81-reference-image.md
@@ -1,9 +1,8 @@
 ---
 title: Create a Windows 10 reference image (Windows 10)
 description: Creating a reference image is important because that image serves as the foundation for the devices in your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: 9da2fb57-f2ff-4fce-a858-4ae4c237b5aa
-keywords: ["deploy deployment configure customize install installation"]
+keywords: ["deploy, deployment, configure, customize, install, installation"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,17 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [The reference image](#the-reference-image)
--   [Set up the MDT build lab deployment share](#sec01)
--   [Add the setup files](#sec02)
--   [Add applications](#sec03)
--   [Create the reference image task sequence](#sec04)
--   [Configure the MDT deployment share rules](#sec05)
--   [Build the Windows 10 reference image](#sec06)
--   [Related topics](#related-topics)
-
 Creating a reference image is important because that image serves as the foundation for the devices in your organization. In this topic, you will learn how to create a Windows 10 reference image using the Microsoft Deployment Toolkit (MDT) 2013 Update 1. You will create a deployment share, configure rules and settings, and import all the applications and operating system files required to build a Windows 10 reference image. After completing the steps outlined in this topic, you will have a Windows 10 reference image that can be used in your deployment solution.
 
 For the purposes of this topic, we will use four machines: DC01, MDT01, HV01, and PC0001. DC01 is a domain controller, PC0001 is a Windows 10 Enterprise x64 client, and MDT01 is a Windows Server 2012 R2 standard server. HV01 is a Hyper-V host server, but HV01 could be replaced by PC0001 as long as PC0001 has enough memory and is capable of running Hyper-V. MDT01, HV01, and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof).
diff --git a/windows/deploy/create-an-application-to-deploy-with-windows-81-using-configuration-manager.md b/windows/deploy/create-an-application-to-deploy-with-windows-81-using-configuration-manager.md
index 92e1d3af69..66e8eb821c 100644
--- a/windows/deploy/create-an-application-to-deploy-with-windows-81-using-configuration-manager.md
+++ b/windows/deploy/create-an-application-to-deploy-with-windows-81-using-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Create an application to deploy with Windows 10 using Configuration Manager (Windows 10)
 description: Microsoft System Center 2012 R2 Configuration Manager supports deploying applications as part of the Windows 10 deployment process.
-MSHAttr: PreferredLib /library
 ms.assetid: 2dfb2f39-1597-4999-b4ec-b063e8a8c90c
-keywords: ["deployment task sequence custom customize"]
+keywords: ["deployment, task sequence, custom, customize"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/custom-xml-examples-usmt-win7-usmt-win8.md b/windows/deploy/custom-xml-examples-usmt-win7-usmt-win8.md
index 3e8ca2c9ce..98f2a55bcd 100644
--- a/windows/deploy/custom-xml-examples-usmt-win7-usmt-win8.md
+++ b/windows/deploy/custom-xml-examples-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Custom XML Examples (Windows 10)
 description: Custom XML Examples
-MSHAttr: PreferredLib /library
 ms.assetid: 48f441d9-6c66-43ef-91e9-7c78cde6fcc0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/customize-usmt-xml-files-usmt-win7-usmt-win8.md b/windows/deploy/customize-usmt-xml-files-usmt-win7-usmt-win8.md
index 89de08e9cd..bae37705ba 100644
--- a/windows/deploy/customize-usmt-xml-files-usmt-win7-usmt-win8.md
+++ b/windows/deploy/customize-usmt-xml-files-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Customize USMT XML Files (Windows 10)
 description: Customize USMT XML Files
-MSHAttr: PreferredLib /library
 ms.assetid: d58363c1-fd13-4f65-8b91-9986659dc93e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/deploy-a-windows-81-image-using-mdt-2013.md b/windows/deploy/deploy-a-windows-81-image-using-mdt-2013.md
index 88be0305fb..f71f735d90 100644
--- a/windows/deploy/deploy-a-windows-81-image-using-mdt-2013.md
+++ b/windows/deploy/deploy-a-windows-81-image-using-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Deploy a Windows 10 image using MDT 2013 Update 1 (Windows 10)
-description: This topic will show you how to take your reference image for Windows 10 and deploy that image to your environment using the Microsoft Deployment Toolkit (MDT) and MDT 2013 Update 1 specifically.
-MSHAttr: PreferredLib /library
+description: This topic will show you how to take your reference image for Windows 10, and deploy that image to your environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 1 specifically.
 ms.assetid: 1d70a3d8-1b1d-4051-b656-c0393a93f83c
-keywords: ["deployment automate tools configure"]
+keywords: ["deployment, automate, tools, configure"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,21 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Step 1: Configure Active Directory permissions](#sec01)
--   [Step 2: Set up the MDT production deployment share](#sec02)
--   [Step 3: Add a custom image](#sec03)
--   [Step 4: Add an application](#sec04)
--   [Step 5: Prepare the drivers repository](#sec05)
--   [Step 6: Create the deployment task sequence](#sec06)
--   [Step 7: Configure the MDT production deployment share](#sec07)
--   [Step 8: Deploy the Windows 10 client image](#sec08)
--   [Multicast deployments](#sec09)
--   [Use offline media to deploy Windows 10](#sec10)
--   [Unified Extensible Firmware Interface (UEFI)-based deployments](#sec11)
--   [Related topics](#related-topics)
-
 This topic will show you how to take your reference image for Windows 10, and deploy that image to your environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 1 specifically. You will prepare for this by creating a MDT deployment share that is used solely for image deployment. Separating the processes of creating reference images from the processes used to deploy them in production allows greater control of on both processes. You will then configure the deployment share, create a new task sequence, add applications, add drivers, add rules, and configure Active Directory permissions for deployment.
 
 For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0005. DC01 is a domain controller, MDT01 is a Windows Server 2012 R2 standard server, and PC0005 is a blank machine to which you deploy Windows 10. MDT01 and PC0005 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/deploy-windows-81-using-pxe-and-configuration-manager.md b/windows/deploy/deploy-windows-81-using-pxe-and-configuration-manager.md
index fb32896b93..a423c563e0 100644
--- a/windows/deploy/deploy-windows-81-using-pxe-and-configuration-manager.md
+++ b/windows/deploy/deploy-windows-81-using-pxe-and-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Deploy Windows 10 using PXE and Configuration Manager (Windows 10)
-description: In this topic you will learn how to deploy Windows 10 using Microsoft System Center 2012 R2 Configuration Manager deployment packages and task sequences.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to deploy Windows 10 using Microsoft System Center 2012 R2 Configuration Manager deployment packages and task sequences.
 ms.assetid: fb93f514-5b30-4f4b-99dc-58e6860009fa
-keywords: ["deployment image UEFI task sequence"]
+keywords: ["deployment, image, UEFI, task sequence"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/deploy-windows-81-with-system-center-2012-r2-configuration-manager.md b/windows/deploy/deploy-windows-81-with-system-center-2012-r2-configuration-manager.md
index 2388f7a094..ae8394b095 100644
--- a/windows/deploy/deploy-windows-81-with-system-center-2012-r2-configuration-manager.md
+++ b/windows/deploy/deploy-windows-81-with-system-center-2012-r2-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Deploy Windows 10 with System Center 2012 R2 Configuration Manager (Windows 10)
-description: If you have Microsoft System Center 2012 R2 Configuration Manager in your environment you will most likely want to use it to deploy Windows 10.
-MSHAttr: PreferredLib /library
+description: If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10.
 ms.assetid: eacd7b7b-dde0-423d-97cd-29bde9e8b363
-keywords: ["deployment custom boot"]
+keywords: ["deployment, custom, boot"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/deploy-windows-81-with-the-microsoft-deployment-toolkit.md b/windows/deploy/deploy-windows-81-with-the-microsoft-deployment-toolkit.md
index 16c66a6d26..20361ab3bf 100644
--- a/windows/deploy/deploy-windows-81-with-the-microsoft-deployment-toolkit.md
+++ b/windows/deploy/deploy-windows-81-with-the-microsoft-deployment-toolkit.md
@@ -1,7 +1,6 @@
 ---
 title: Deploy Windows 10 with the Microsoft Deployment Toolkit (Windows 10)
-description: This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT) and MDT 2013 Update 1 specifically.
-MSHAttr: PreferredLib /library
+description: This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 1 specifically.
 ms.assetid: 837f009c-617e-4b3f-9028-2246067ee0fb
 keywords: ["deploy", "tools", "configure", "script"]
 ms.prod: W10
@@ -119,7 +118,7 @@ The information in this guide is designed to help you deploy Windows 10. In ord
 
 [Sideload apps in Windows 10](sideload-apps-in-windows-10.md)
 
-[Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+[Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/deploy-windows-to-go-in-your-organization-small-scenario.md b/windows/deploy/deploy-windows-to-go-in-your-organization-small-scenario.md
index 764ca899fe..afc35d1613 100644
--- a/windows/deploy/deploy-windows-to-go-in-your-organization-small-scenario.md
+++ b/windows/deploy/deploy-windows-to-go-in-your-organization-small-scenario.md
@@ -1,9 +1,8 @@
 ---
 title: Deploy Windows To Go in your organization (Windows 10)
 description: This topic helps you to deploy Windows To Go in your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: cfe550be-ffbd-42d1-ab4d-80efae49b07f
-keywords: ["deployment USB device BitLocker workspace security data"]
+keywords: ["deployment, USB, device, BitLocker, workspace, security, data"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,14 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Deployment tips](#deployment-tips)
--   [Basic deployment steps](#basic-deployment-steps)
--   [Advanced deployment steps](#advanced-deployment-steps)
--   [Considerations when using different USB keyboard layouts with Windows To Go](#considerations-when-using-different-usb-keyboard-layouts-with-windows-to-go)
--   [Related topics](#related-topics)
-
 This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](../plan/windows-to-go-feature-overview-scenario.md) and [Prepare your organization for Windows To Go](../plan/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment.
 
 **Note**  
diff --git a/windows/deploy/determine-what-to-migrate-usmt-win7-usmt-win8.md b/windows/deploy/determine-what-to-migrate-usmt-win7-usmt-win8.md
index dc3668c3bb..68d5092f42 100644
--- a/windows/deploy/determine-what-to-migrate-usmt-win7-usmt-win8.md
+++ b/windows/deploy/determine-what-to-migrate-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Determine What to Migrate (Windows 10)
 description: Determine What to Migrate
-MSHAttr: PreferredLib /library
 ms.assetid: 01ae1d13-c3eb-4618-b39d-ee5d18d55761
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/estimate-migration-store-size-usmt-win7-usmt-win8.md b/windows/deploy/estimate-migration-store-size-usmt-win7-usmt-win8.md
index 8b26fe1720..ecc4a77d16 100644
--- a/windows/deploy/estimate-migration-store-size-usmt-win7-usmt-win8.md
+++ b/windows/deploy/estimate-migration-store-size-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Estimate Migration Store Size (Windows 10)
 description: Estimate Migration Store Size
-MSHAttr: PreferredLib /library
 ms.assetid: cfb9062b-7a2a-467a-a24e-0b31ce830093
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/exclude-files-and-settings-usmt.md b/windows/deploy/exclude-files-and-settings-usmt.md
index eb75e591bb..ac1e728397 100644
--- a/windows/deploy/exclude-files-and-settings-usmt.md
+++ b/windows/deploy/exclude-files-and-settings-usmt.md
@@ -1,7 +1,6 @@
 ---
 title: Exclude Files and Settings (Windows 10)
 description: Exclude Files and Settings
-MSHAttr: PreferredLib /library
 ms.assetid: df85baf1-6e29-4995-a4bb-ba3f8f7fed0b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/extract-files-from-a-compressed-usmt-migration-store.md b/windows/deploy/extract-files-from-a-compressed-usmt-migration-store.md
index b7cc4207fb..70d6bc7564 100644
--- a/windows/deploy/extract-files-from-a-compressed-usmt-migration-store.md
+++ b/windows/deploy/extract-files-from-a-compressed-usmt-migration-store.md
@@ -1,7 +1,6 @@
 ---
 title: Extract Files from a Compressed USMT Migration Store (Windows 10)
 description: Extract Files from a Compressed USMT Migration Store
-MSHAttr: PreferredLib /library
 ms.assetid: ad9fbd6e-f89e-4444-8538-9b11566b1f33
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/finalize-the-operating-system-configuration-for-windows-81-deployment-with-configuration-manager.md b/windows/deploy/finalize-the-operating-system-configuration-for-windows-81-deployment-with-configuration-manager.md
index 96ffc9c9df..aed01ca1a8 100644
--- a/windows/deploy/finalize-the-operating-system-configuration-for-windows-81-deployment-with-configuration-manager.md
+++ b/windows/deploy/finalize-the-operating-system-configuration-for-windows-81-deployment-with-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Finalize the operating system configuration for Windows 10 deployment with Configuration Manager (Windows 10)
-description: This topic walks you through the steps to finalize the configuration of your Windows 10 operating deployment which includes enablement of the optional Microsoft Deployment Toolkit (MDT) monitoring for Microsoft System Center 2012 R2 Configuration Manager logs folder creation rules configuration content distribution and deployment of the previously created task sequence.
-MSHAttr: PreferredLib /library
+description: This topic walks you through the steps to finalize the configuration of your Windows 10 operating deployment, which includes enablement of the optional Microsoft Deployment Toolkit (MDT) monitoring for Microsoft System Center 2012 R2 Configuration Manager, logs folder creation, rules configuration, content distribution, and deployment of the previously created task sequence.
 ms.assetid: 38b55fa8-e717-4689-bd43-8348751d493e
-keywords: ["configure deploy upgrade"]
+keywords: ["configure, deploy, upgrade"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,16 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Enable MDT monitoring](#sec01)
--   [Create and share the Logs folder](#sec02)
--   [Configure the rules (Windows 10 x64 Settings package)](#sec03)
--   [Distribute content to the CM01 distribution portal](#sec04)
--   [Create a deployment for the task sequence](#sec05)
--   [Configure Configuration Manager to prompt for the computer name during deployment (optional)](#sec06)
--   [Related topics](#related-topics)
-
 This topic walks you through the steps to finalize the configuration of your Windows 10 operating deployment, which includes enablement of the optional Microsoft Deployment Toolkit (MDT) monitoring for Microsoft System Center 2012 R2 Configuration Manager, logs folder creation, rules configuration, content distribution, and deployment of the previously created task sequence.
 
 For the purposes of this topic, we will use two machines: DC01 and CM01. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. Both are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md b/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md
index 3cddba0c92..a7ce688d17 100644
--- a/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md
+++ b/windows/deploy/frequently-asked-questions-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Frequently Asked Questions (Windows 10)
 description: Frequently Asked Questions
-MSHAttr: PreferredLib /library
 ms.assetid: 813c13a7-6818-4e6e-9284-7ee49493241b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/general-conventions-usmt-win7-usmt-win8.md b/windows/deploy/general-conventions-usmt-win7-usmt-win8.md
index 65ddba0521..147cdf05e2 100644
--- a/windows/deploy/general-conventions-usmt-win7-usmt-win8.md
+++ b/windows/deploy/general-conventions-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: General Conventions (Windows 10)
 description: General Conventions
-MSHAttr: PreferredLib /library
 ms.assetid: 5761986e-a847-41bd-bf8e-7c1bd01acbc6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit--mdt-.md b/windows/deploy/get-started-with-the-microsoft-deployment-toolkit--mdt-.md
index 328476bd90..de438adaf7 100644
--- a/windows/deploy/get-started-with-the-microsoft-deployment-toolkit--mdt-.md
+++ b/windows/deploy/get-started-with-the-microsoft-deployment-toolkit--mdt-.md
@@ -1,7 +1,6 @@
 ---
 title: Get started with the Microsoft Deployment Toolkit (MDT) (Windows 10)
-description: This topic will help you gain a better understanding of how to use the Microsoft Deployment Toolkit (MDT) and MDT 2013 Update 1 in particular as part of a Windows operating system deployment.
-MSHAttr: PreferredLib /library
+description: This topic will help you gain a better understanding of how to use the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 1 in particular, as part of a Windows operating system deployment.
 ms.assetid: a256442c-be47-4bb9-a105-c831f58ce3ee
 keywords: ["deploy", "image", "feature", "install", "tools"]
 ms.prod: W10
diff --git a/windows/deploy/getting-started-with-the-user-state-migration-tool--usmt-.md b/windows/deploy/getting-started-with-the-user-state-migration-tool--usmt-.md
index b710c9ecc5..4655b7d762 100644
--- a/windows/deploy/getting-started-with-the-user-state-migration-tool--usmt-.md
+++ b/windows/deploy/getting-started-with-the-user-state-migration-tool--usmt-.md
@@ -1,7 +1,6 @@
 ---
 title: Getting Started with the User State Migration Tool (USMT) (Windows 10)
 description: Getting Started with the User State Migration Tool (USMT)
-MSHAttr: PreferredLib /library
 ms.assetid: 506ff1d2-94b8-4460-8672-56aad963504b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/hard-link-migration-store-usmt-win8.md b/windows/deploy/hard-link-migration-store-usmt-win8.md
index 4c64d48ba6..e1b2f13561 100644
--- a/windows/deploy/hard-link-migration-store-usmt-win8.md
+++ b/windows/deploy/hard-link-migration-store-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
-title: Hard Link Migration Store (Windows 10)
-description: Hard Link Migration Store
-MSHAttr: PreferredLib /library
+title: Hard-Link Migration Store (Windows 10)
+description: Hard-Link Migration Store
 ms.assetid: b0598418-4607-4952-bfa3-b6e4aaa2c574
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/how-usmt-works-usmt-win7-usmt-win8.md b/windows/deploy/how-usmt-works-usmt-win7-usmt-win8.md
index 42c48d33dc..a0e7e4e3d7 100644
--- a/windows/deploy/how-usmt-works-usmt-win7-usmt-win8.md
+++ b/windows/deploy/how-usmt-works-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: How USMT Works (Windows 10)
 description: How USMT Works
-MSHAttr: PreferredLib /library
 ms.assetid: 5c8bd669-9e1e-473d-81e6-652f40b24171
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/identify-applications-settings-usmt-win7-usmt-win8.md b/windows/deploy/identify-applications-settings-usmt-win7-usmt-win8.md
index 2c0f39b206..578563ddf2 100644
--- a/windows/deploy/identify-applications-settings-usmt-win7-usmt-win8.md
+++ b/windows/deploy/identify-applications-settings-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Identify Applications Settings (Windows 10)
 description: Identify Applications Settings
-MSHAttr: PreferredLib /library
 ms.assetid: eda68031-9b02-4a5b-a893-3786a6505381
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/identify-file-types-files-and-folders-usmt-win8.md b/windows/deploy/identify-file-types-files-and-folders-usmt-win8.md
index 70a83c77dd..444f293d3d 100644
--- a/windows/deploy/identify-file-types-files-and-folders-usmt-win8.md
+++ b/windows/deploy/identify-file-types-files-and-folders-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
-title: Identify File Types Files and Folders (Windows 10)
-description: Identify File Types Files and Folders
-MSHAttr: PreferredLib /library
+title: Identify File Types, Files, and Folders (Windows 10)
+description: Identify File Types, Files, and Folders
 ms.assetid: 93bb2a33-c126-4f7a-a961-6c89686d54e0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/identify-operating-system-settings-usmt-win7-usmt-win8.md b/windows/deploy/identify-operating-system-settings-usmt-win7-usmt-win8.md
index bc6f0e0e7f..1de2815cf5 100644
--- a/windows/deploy/identify-operating-system-settings-usmt-win7-usmt-win8.md
+++ b/windows/deploy/identify-operating-system-settings-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Identify Operating System Settings (Windows 10)
 description: Identify Operating System Settings
-MSHAttr: PreferredLib /library
 ms.assetid: 1704ab18-1765-41fb-a27c-3aa3128fa242
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/identify-users-usmt-win7-usmt-win8.md b/windows/deploy/identify-users-usmt-win7-usmt-win8.md
index d8b3a4510f..ee151348d5 100644
--- a/windows/deploy/identify-users-usmt-win7-usmt-win8.md
+++ b/windows/deploy/identify-users-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Identify Users (Windows 10)
 description: Identify Users
-MSHAttr: PreferredLib /library
 ms.assetid: 957a4fe9-79fd-44a2-8c26-33e50f71f9de
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/import-and-export-vamt-data-vamt-30-win8.md b/windows/deploy/import-export-vamt-data.md
similarity index 96%
rename from windows/deploy/import-and-export-vamt-data-vamt-30-win8.md
rename to windows/deploy/import-export-vamt-data.md
index 335b65c855..bd063c24a1 100644
--- a/windows/deploy/import-and-export-vamt-data-vamt-30-win8.md
+++ b/windows/deploy/import-export-vamt-data.md
@@ -1,7 +1,6 @@
 ---
 title: Import and Export VAMT Data (Windows 10)
 description: Import and Export VAMT Data
-MSHAttr: PreferredLib /library
 ms.assetid: 09a2c595-1a61-4da6-bd46-4ba8763cfd4f
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -64,7 +63,7 @@ Exporting VAMT data from a non-Internet-connected VAMT host computer is the firs
 ## Related topics
 
 
-[Perform Proxy Activation](perform-proxy-activation-vamt-30-win8.md)
+[Perform Proxy Activation](proxy-activation-vamt.md)
 
  
 
diff --git a/windows/deploy/include-files-and-settings-usmt.md b/windows/deploy/include-files-and-settings-usmt.md
index da0cea1b87..04eabc2f5b 100644
--- a/windows/deploy/include-files-and-settings-usmt.md
+++ b/windows/deploy/include-files-and-settings-usmt.md
@@ -1,7 +1,6 @@
 ---
 title: Include Files and Settings (Windows 10)
 description: Include Files and Settings
-MSHAttr: PreferredLib /library
 ms.assetid: 9009c6a5-0612-4478-8742-abe5eb6cbac8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/index.md b/windows/deploy/index.md
index 823a7ba595..df7ff0fb92 100644
--- a/windows/deploy/index.md
+++ b/windows/deploy/index.md
@@ -1,7 +1,6 @@
 ---
 title: Deploy Windows 10 (Windows 10)
 description: Learn about deploying Windows 10 for IT professionals.
-MSHAttr: PreferredLib /library
 ms.assetid: E9E2DED5-DBA7-4300-B411-BA0FD39BE18C
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -70,7 +69,7 @@ Learn about deploying Windows 10 for IT professionals.
 <td align="left"><p>Sideload line-of-business apps in Windows 10.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Volume Activation [client]](volume-activation-for-windows-81-client.md)</p></td>
+<td align="left"><p>[Volume Activation [client]](volume-activation-windows-10.md)</p></td>
 <td align="left"><p>This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows.</p></td>
 </tr>
 <tr class="even">
@@ -82,6 +81,11 @@ Learn about deploying Windows 10 for IT professionals.
 
  
 
+## Related topics
+
+
+[Windows 10 and Windows 10 Mobile](../index.md)
+
  
 
  
diff --git a/windows/deploy/install-and-configure-vamt-vamt-30-win8.md b/windows/deploy/install-configure-vamt.md
similarity index 75%
rename from windows/deploy/install-and-configure-vamt-vamt-30-win8.md
rename to windows/deploy/install-configure-vamt.md
index 75fbf097d6..4bbaf3a8a7 100644
--- a/windows/deploy/install-and-configure-vamt-vamt-30-win8.md
+++ b/windows/deploy/install-configure-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Install and Configure VAMT (Windows 10)
 description: Install and Configure VAMT
-MSHAttr: PreferredLib /library
 ms.assetid: 5c7ae9b9-0dbc-4277-bc4f-8b3e4ab0bf50
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,15 +23,15 @@ This section describes how to install and configure the Volume Activation Manage
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[VAMT Requirements](vamt-requirements-vamt-30-win8.md)</p></td>
+<td align="left"><p>[VAMT Requirements](vamt-requirements.md)</p></td>
 <td align="left"><p>Provides system requirements for installing VAMT on a host computer.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Install VAMT](install-vamt-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Install VAMT](install-vamt.md)</p></td>
 <td align="left"><p>Describes how to get and install VAMT.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Configure Client Computers](configure-client-computers-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Configure Client Computers](configure-client-computers-vamt.md)</p></td>
 <td align="left"><p>Describes how to configure client computers on your network to work with VAMT.</p></td>
 </tr>
 </tbody>
@@ -43,7 +42,7 @@ This section describes how to install and configure the Volume Activation Manage
 ## Related topics
 
 
-[Introduction to VAMT](introduction-to-vamtvamt-30-win8.md)
+[Introduction to VAMT](introduction-vamt.md)
 
  
 
diff --git a/windows/deploy/install-a-kms-client-key-vamt-30-win8.md b/windows/deploy/install-kms-client-key-vamt.md
similarity index 96%
rename from windows/deploy/install-a-kms-client-key-vamt-30-win8.md
rename to windows/deploy/install-kms-client-key-vamt.md
index e95450f730..b04d8ee93b 100644
--- a/windows/deploy/install-a-kms-client-key-vamt-30-win8.md
+++ b/windows/deploy/install-kms-client-key-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Install a KMS Client Key (Windows 10)
 description: Install a KMS Client Key
-MSHAttr: PreferredLib /library
 ms.assetid: d234468e-7917-4cf5-b0a8-4968454f7759
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -46,7 +45,7 @@ The same status is shown under the **Status of Last Action** column in the produ
 ## Related topics
 
 
-[Perform KMS Activation](perform-kms-activation-vamt-30-win8.md)
+[Perform KMS Activation](kms-activation-vamt.md)
 
  
 
diff --git a/windows/deploy/install-a-product-key-vamt-30-win8.md b/windows/deploy/install-product-key-vamt.md
similarity index 96%
rename from windows/deploy/install-a-product-key-vamt-30-win8.md
rename to windows/deploy/install-product-key-vamt.md
index 0d4a516836..08f48105c2 100644
--- a/windows/deploy/install-a-product-key-vamt-30-win8.md
+++ b/windows/deploy/install-product-key-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Install a Product Key (Windows 10)
 description: Install a Product Key
-MSHAttr: PreferredLib /library
 ms.assetid: 78812c87-2208-4f8b-9c2c-5a8a18b2d648
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -46,7 +45,7 @@ Product key installation will fail if VAMT finds mismatched key types or edition
 ## Related topics
 
 
-[Manage Product Keys](manage-product-keys-vamt-30-win8.md)
+[Manage Product Keys](manage-product-keys-vamt.md)
 
  
 
diff --git a/windows/deploy/install-vamt-vamt-30-win8.md b/windows/deploy/install-vamt.md
similarity index 96%
rename from windows/deploy/install-vamt-vamt-30-win8.md
rename to windows/deploy/install-vamt.md
index 7f09852ece..1d662e9775 100644
--- a/windows/deploy/install-vamt-vamt-30-win8.md
+++ b/windows/deploy/install-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Install VAMT (Windows 10)
 description: Install VAMT
-MSHAttr: PreferredLib /library
 ms.assetid: 2eabd3e2-0a68-43a5-8189-2947e46482fc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -63,7 +62,7 @@ To uninstall VAMT via the **Programs and Features** Control Panel:
 ## Related topics
 
 
-[Install and Configure VAMT](install-and-configure-vamt-vamt-30-win8.md)
+[Install and Configure VAMT](install-configure-vamt.md)
 
  
 
diff --git a/windows/deploy/integrate-configuration-manager-with-mdt-2013.md b/windows/deploy/integrate-configuration-manager-with-mdt-2013.md
index 2e966e4ef4..00eb3397c7 100644
--- a/windows/deploy/integrate-configuration-manager-with-mdt-2013.md
+++ b/windows/deploy/integrate-configuration-manager-with-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Integrate Configuration Manager with MDT 2013 Update 1 (Windows 10)
 description: This topic will help you understand the benefits of integrating the Microsoft Deployment Toolkit with Microsoft System Center 2012 R2 Configuration Manager SP1 when you deploy a new or updated version of the Windows operating system.
-MSHAttr: PreferredLib /library
 ms.assetid: 3bd1cf92-81e5-48dc-b874-0f5d9472e5a5
-keywords: ["deploy image customize task sequence"]
+keywords: ["deploy, image, customize, task sequence"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,12 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Why integrate MDT 2013 Update 1 with Configuration Manager](#sec01)
--   [Why use MDT Lite Touch to create reference images](#sec02)
--   [Related topics](#related-topics)
-
 This topic will help you understand the benefits of integrating the Microsoft Deployment Toolkit with Microsoft System Center 2012 R2 Configuration Manager SP1 when you deploy a new or updated version of the Windows operating system.
 
 MDT 2013 is a free, supported download from Microsoft that adds approximately 280 enhancements to Windows operating system deployment with System Center 2012 R2 Configuration Manager SP1. It is, therefore, recommended that you utilize MDT when deploying the Windows operating system with Configuration Manager SP1. In addition to integrating MDT with Configuration Manager, we also recommend using MDT Lite Touch to create the Windows 10 reference images used in Configuration Manager. For more information on how to create a reference image, see [Create a Windows 10 reference image](create-a-windows-81-reference-image.md).
diff --git a/windows/deploy/introduction-to-vamtvamt-30-win8.md b/windows/deploy/introduction-vamt.md
similarity index 98%
rename from windows/deploy/introduction-to-vamtvamt-30-win8.md
rename to windows/deploy/introduction-vamt.md
index ab6c05e0d9..9565dc5873 100644
--- a/windows/deploy/introduction-to-vamtvamt-30-win8.md
+++ b/windows/deploy/introduction-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Introduction to VAMT (Windows 10)
 description: Introduction to VAMT
-MSHAttr: PreferredLib /library
 ms.assetid: 0439685e-0bae-4967-b0d4-dd84ca6d7fa7
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -79,7 +78,7 @@ VAMT provides a single, graphical user interface for managing activations, and f
 ## Related topics
 
 
-[VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)
+[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 
diff --git a/windows/deploy/key-features-in-mdt-2013.md b/windows/deploy/key-features-in-mdt-2013.md
index f23a6df7b2..99cf7abe1d 100644
--- a/windows/deploy/key-features-in-mdt-2013.md
+++ b/windows/deploy/key-features-in-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Key features in MDT 2013 Update 1 (Windows 10)
-description: The Microsoft Deployment Toolkit (MDT) has been in existence since 2003 when it was first introduced as Business Desktop Deployment (BDD) 1.0.
-MSHAttr: PreferredLib /library
+description: The Microsoft Deployment Toolkit (MDT) has been in existence since 2003, when it was first introduced as Business Desktop Deployment (BDD) 1.0.
 ms.assetid: 858e384f-e9db-4a93-9a8b-101a503e4868
-keywords: ["deploy feature tools upgrade migrate provisioning"]
+keywords: ["deploy, feature, tools, upgrade, migrate, provisioning"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/perform-kms-activation-vamt-30-win8.md b/windows/deploy/kms-activation-vamt.md
similarity index 96%
rename from windows/deploy/perform-kms-activation-vamt-30-win8.md
rename to windows/deploy/kms-activation-vamt.md
index 8c239af100..6ab8835bf6 100644
--- a/windows/deploy/perform-kms-activation-vamt-30-win8.md
+++ b/windows/deploy/kms-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Perform KMS Activation (Windows 10)
 description: Perform KMS Activation
-MSHAttr: PreferredLib /library
 ms.assetid: 5a3ae8e6-083e-4153-837e-ab0a225c1d10
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -25,9 +24,9 @@ Before configuring KMS activation, ensure that your network and VAMT installatio
 
 -   VAMT is installed on a central computer with network access to all client computers.
 
--   The products to be activated have been added to VAMT. For more information on adding product keys, see [Install a KMS Client Key](install-a-kms-client-key-vamt-30-win8.md).
+-   The products to be activated have been added to VAMT. For more information on adding product keys, see [Install a KMS Client Key](install-kms-client-key-vamt.md).
 
--   VAMT has administrative permissions on all computers to be activated, and Windows Management Instrumentation (WMI) is accessible through the Windows Firewall. For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+-   VAMT has administrative permissions on all computers to be activated, and Windows Management Instrumentation (WMI) is accessible through the Windows Firewall. For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 ## To configure computers for KMS activation
 
diff --git a/windows/deploy/loadstate-syntax-usmt-win7-usmt-win8.md b/windows/deploy/loadstate-syntax-usmt-win7-usmt-win8.md
index 170ea7adb0..1c3af506cf 100644
--- a/windows/deploy/loadstate-syntax-usmt-win7-usmt-win8.md
+++ b/windows/deploy/loadstate-syntax-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: LoadState Syntax (Windows 10)
 description: LoadState Syntax
-MSHAttr: PreferredLib /library
 ms.assetid: 53d2143b-cbe9-4cfc-8506-36e9d429f6d4
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/perform-local-reactivation-vamt-30-win8.md b/windows/deploy/local-reactivation-vamt.md
similarity index 97%
rename from windows/deploy/perform-local-reactivation-vamt-30-win8.md
rename to windows/deploy/local-reactivation-vamt.md
index cc22af3876..f9b5bc72bb 100644
--- a/windows/deploy/perform-local-reactivation-vamt-30-win8.md
+++ b/windows/deploy/local-reactivation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Perform Local Reactivation (Windows 10)
 description: Perform Local Reactivation
-MSHAttr: PreferredLib /library
 ms.assetid: aacd5ded-da11-4d27-a866-3f57332f5dec
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -55,7 +54,7 @@ During the initial proxy activation, the CID is bound to a digital “fingerprin
 ## Related topics
 
 
-[Manage Activations](manage-activations-vamt-30-win8.md)
+[Manage Activations](manage-activations-vamt.md)
 
  
 
diff --git a/windows/deploy/log-files-usmt-win7-usmt-win8.md b/windows/deploy/log-files-usmt-win7-usmt-win8.md
index 4f795b2a1c..654e113b1d 100644
--- a/windows/deploy/log-files-usmt-win7-usmt-win8.md
+++ b/windows/deploy/log-files-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Log Files (Windows 10)
 description: Log Files
-MSHAttr: PreferredLib /library
 ms.assetid: 28185ebd-630a-4bbd-94f4-8c48aad05649
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/manage-activations-vamt-30-win8.md b/windows/deploy/manage-activations-vamt.md
similarity index 72%
rename from windows/deploy/manage-activations-vamt-30-win8.md
rename to windows/deploy/manage-activations-vamt.md
index d82edc4776..5c582266b5 100644
--- a/windows/deploy/manage-activations-vamt-30-win8.md
+++ b/windows/deploy/manage-activations-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Manage Activations (Windows 10)
 description: Manage Activations
-MSHAttr: PreferredLib /library
 ms.assetid: 53bad9ed-9430-4f64-a8de-80613870862c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,27 +23,27 @@ This section describes how to activate a client computer, by using a variety of
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Perform Online Activation](perform-online-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Perform Online Activation](online-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how to activate a client computer over the Internet.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Perform Proxy Activation](perform-proxy-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Perform Proxy Activation](proxy-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how to perform volume activation for client products that do not have Internet access.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Perform KMS Activation](perform-kms-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Perform KMS Activation](kms-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how perform volume activation using the Key Management Service (KMS).</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Perform Local Reactivation](perform-local-reactivation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Perform Local Reactivation](local-reactivation-vamt.md)</p></td>
 <td align="left"><p>Describes how to reactivate an operating system or Office program that was reinstalled.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Activate an Active Directory Forest Online](activate-an-active-directory-forest-online.md)</p></td>
+<td align="left"><p>[Activate an Active Directory Forest Online](activate-forest-vamt.md)</p></td>
 <td align="left"><p>Describes how to use Active Directory-Based Activation to online activate an Active Directory forest.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Activate by Proxy an Active Directory Forest](activate-by-proxy-an-active-directory-forest.md)</p></td>
+<td align="left"><p>[Activate by Proxy an Active Directory Forest](activate-forest-by-proxy-vamt.md)</p></td>
 <td align="left"><p>Describes how to use Active Directory-Based Activation to proxy activate an Active Directory forest that is not connected to the Internet.</p></td>
 </tr>
 </tbody>
diff --git a/windows/deploy/manage-product-keys-vamt-30-win8.md b/windows/deploy/manage-product-keys-vamt.md
similarity index 73%
rename from windows/deploy/manage-product-keys-vamt-30-win8.md
rename to windows/deploy/manage-product-keys-vamt.md
index e877e9d832..8e39962b97 100644
--- a/windows/deploy/manage-product-keys-vamt-30-win8.md
+++ b/windows/deploy/manage-product-keys-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Manage Product Keys (Windows 10)
 description: Manage Product Keys
-MSHAttr: PreferredLib /library
 ms.assetid: 4c6c4216-b4b7-437c-904e-4cb257f913cd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,15 +23,15 @@ This section describes how to add and remove a product key from the Volume Activ
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Add and Remove a Product Key](add-and-remove-a-product-key-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Add and Remove a Product Key](add-remove-product-key-vamt.md)</p></td>
 <td align="left"><p>Describes how to add a product key to the VAMT database.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Install a Product Key](install-a-product-key-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Install a Product Key](install-product-key-vamt.md)</p></td>
 <td align="left"><p>Describes how to install a product key for specific product.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Install a KMS Client Key](install-a-kms-client-key-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Install a KMS Client Key](install-kms-client-key-vamt.md)</p></td>
 <td align="left"><p>Describes how to install a GVLK (KMS client) key.</p></td>
 </tr>
 </tbody>
diff --git a/windows/deploy/manage-vamt-data-vamt-30-win8.md b/windows/deploy/manage-vamt-data.md
similarity index 86%
rename from windows/deploy/manage-vamt-data-vamt-30-win8.md
rename to windows/deploy/manage-vamt-data.md
index ce57d7ab6d..61867a69d6 100644
--- a/windows/deploy/manage-vamt-data-vamt-30-win8.md
+++ b/windows/deploy/manage-vamt-data.md
@@ -1,7 +1,6 @@
 ---
 title: Manage VAMT Data (Windows 10)
 description: Manage VAMT Data
-MSHAttr: PreferredLib /library
 ms.assetid: 233eefa4-3125-4965-a12d-297a67079dc4
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,7 +23,7 @@ This section describes how to save, import, export, and merge a Computer Informa
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Import and Export VAMT Data](import-and-export-vamt-data-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Import and Export VAMT Data](import-export-vamt-data.md)</p></td>
 <td align="left"><p>Describes how to import and export VAMT data.</p></td>
 </tr>
 <tr class="even">
diff --git a/windows/deploy/mdt-2013-lite-touch-components.md b/windows/deploy/mdt-2013-lite-touch-components.md
index 7e43055d37..7d4e355b7d 100644
--- a/windows/deploy/mdt-2013-lite-touch-components.md
+++ b/windows/deploy/mdt-2013-lite-touch-components.md
@@ -1,9 +1,8 @@
 ---
 title: MDT 2013 Update 1 Lite Touch components (Windows 10)
 description: This topic provides an overview of the features in the Microsoft Deployment Toolkit (MDT) 2013 Update 1 that support Lite Touch Installation (LTI) for Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: 7d6fc159-e338-439e-a2e6-1778d0da9089
-keywords: ["deploy install deployment boot log monitor"]
+keywords: ["deploy, install, deployment, boot, log, monitor"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,22 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Deployment shares](#sec01)
--   [Rules](#sec02)
--   [Boot images](#sec03)
--   [Operating systems](#sec04)
--   [Applications](#sec05)
--   [Driver repository](#sec06)
--   [Packages](#sec07)
--   [Task sequences](#sec08)
--   [Task sequence templates](#sec09)
--   [Selection profiles](#sec10)
--   [Logging](#sec11)
--   [Monitoring](#sec12)
--   [Related topics](#related-topics)
-
 This topic provides an overview of the features in the Microsoft Deployment Toolkit (MDT) 2013 Update 1 that support Lite Touch Installation (LTI) for Windows 10. An LTI deployment strategy requires very little infrastructure or user interaction, and can be used to deploy an operating system from a network share or from a physical media, such as a USB flash drive or disc.
 
 When deploying the Windows operating system using MDT, most of the administration and configuration is done through the Deployment Workbench, but you also can perform many of the tasks using Windows PowerShell. The easiest way to find out how to use PowerShell in MDT is to use the Deployment Workbench to perform an operation and at the end of that task, click View Script. That will give you the PowerShell command.
diff --git a/windows/deploy/migrate-application-settings.md b/windows/deploy/migrate-application-settings.md
index d03aa5ac51..8624b4ca16 100644
--- a/windows/deploy/migrate-application-settings.md
+++ b/windows/deploy/migrate-application-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Migrate Application Settings (Windows 10)
 description: Migrate Application Settings
-MSHAttr: PreferredLib /library
 ms.assetid: 28f70a83-0a3e-4a6b-968a-2b78ccd3cc07
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/migrate-efs-files-and-certificates-umst.md b/windows/deploy/migrate-efs-files-and-certificates-umst.md
index 01748479b0..c97de03965 100644
--- a/windows/deploy/migrate-efs-files-and-certificates-umst.md
+++ b/windows/deploy/migrate-efs-files-and-certificates-umst.md
@@ -1,7 +1,6 @@
 ---
 title: Migrate EFS Files and Certificates (Windows 10)
 description: Migrate EFS Files and Certificates
-MSHAttr: PreferredLib /library
 ms.assetid: 7f19a753-ec45-4433-b297-cc30f16fdee1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/migrate-user-accounts-usmt.md b/windows/deploy/migrate-user-accounts-usmt.md
index 2580dad983..478cab9257 100644
--- a/windows/deploy/migrate-user-accounts-usmt.md
+++ b/windows/deploy/migrate-user-accounts-usmt.md
@@ -1,7 +1,6 @@
 ---
 title: Migrate User Accounts (Windows 10)
 description: Migrate User Accounts
-MSHAttr: PreferredLib /library
 ms.assetid: a3668361-43c8-4fd2-b26e-9a2deaeaeb09
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/migration-store-encryption-usmt-win8.md b/windows/deploy/migration-store-encryption-usmt-win8.md
index 573729d381..a1ee7f25ab 100644
--- a/windows/deploy/migration-store-encryption-usmt-win8.md
+++ b/windows/deploy/migration-store-encryption-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Migration Store Encryption (Windows 10)
 description: Migration Store Encryption
-MSHAttr: PreferredLib /library
 ms.assetid: b28c2657-b986-4487-bd38-cb81500b831d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/migration-store-types-overview.md b/windows/deploy/migration-store-types-overview.md
index 3c13058f86..ec76f7eaee 100644
--- a/windows/deploy/migration-store-types-overview.md
+++ b/windows/deploy/migration-store-types-overview.md
@@ -1,7 +1,6 @@
 ---
 title: Migration Store Types Overview (Windows 10)
 description: Migration Store Types Overview
-MSHAttr: PreferredLib /library
 ms.assetid: 3b6ce746-76c6-43ff-8cd5-02ed0ae0cf70
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/monitor-activation-client.md b/windows/deploy/monitor-activation-client.md
index 677f11937e..3e48325fd7 100644
--- a/windows/deploy/monitor-activation-client.md
+++ b/windows/deploy/monitor-activation-client.md
@@ -1,6 +1,5 @@
 ---
 title: Monitor activation (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 264a3e86-c880-4be4-8828-bf4c839dfa26
 description: 
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
@@ -44,7 +43,7 @@ You can monitor the success of the activation process for a computer running Win
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/monitor-the-windows-81-deployment-with-configuration-manager.md b/windows/deploy/monitor-the-windows-81-deployment-with-configuration-manager.md
index 891eaf09df..dd36cecc0d 100644
--- a/windows/deploy/monitor-the-windows-81-deployment-with-configuration-manager.md
+++ b/windows/deploy/monitor-the-windows-81-deployment-with-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Monitor the Windows 10 deployment with Configuration Manager (Windows 10)
-description: In this topic you will learn how to monitor a Windows 10 deployment that was started previously using Microsoft System Center 2012 R2 Configuration Manager and the Microsoft Deployment Toolkit (MDT) Deployment Workbench.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to monitor a Windows 10 deployment that was started previously using Microsoft System Center 2012 R2 Configuration Manager and the Microsoft Deployment Toolkit (MDT) Deployment Workbench.
 ms.assetid: 4863c6aa-6369-4171-8e1a-b052ca195fce
-keywords: ["deploy upgrade"]
+keywords: ["deploy, upgrade"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/offline-migration-reference.md b/windows/deploy/offline-migration-reference.md
index 4ab9ae7e80..5c0149bf07 100644
--- a/windows/deploy/offline-migration-reference.md
+++ b/windows/deploy/offline-migration-reference.md
@@ -1,7 +1,6 @@
 ---
 title: Offline Migration Reference (Windows 10)
 description: Offline Migration Reference
-MSHAttr: PreferredLib /library
 ms.assetid: f347547c-d601-4c3e-8f2d-0138edeacfda
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/perform-online-activation-vamt-30-win8.md b/windows/deploy/online-activation-vamt.md
similarity index 97%
rename from windows/deploy/perform-online-activation-vamt-30-win8.md
rename to windows/deploy/online-activation-vamt.md
index 6685f1c220..c194c48f3a 100644
--- a/windows/deploy/perform-online-activation-vamt-30-win8.md
+++ b/windows/deploy/online-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Perform Online Activation (Windows 10)
 description: Perform Online Activation
-MSHAttr: PreferredLib /library
 ms.assetid: 8381792b-a454-4e66-9b4c-e6e4c9303823
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -25,7 +24,7 @@ Before performing online activation, ensure that the network and the VAMT instal
 
 -   The products that you want to activate are added to VAMT.
 
--   VAMT has administrative permissions on all computers that you intend to activate, and that Windows Management Instrumentation (WMI) can be accessed through the Windows firewall. For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+-   VAMT has administrative permissions on all computers that you intend to activate, and that Windows Management Instrumentation (WMI) can be accessed through the Windows firewall. For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 The product keys that are installed on the client products must have a sufficient number of remaining activations. If you are activating a MAK key, you can retrieve the remaining number of activations for that key by selecting the MAK in the product key list in the center pane and then clicking **Refresh product key data online** in the right-side pane. This retrieves the number of remaining activations for the MAK from Microsoft. Note that this step requires Internet access and that the remaining activation count can only be retrieved for MAKs.
 
@@ -67,7 +66,7 @@ You can use online activation to select products that have different key types a
 ## Related topics
 
 
-[Manage Activations](manage-activations-vamt-30-win8.md)
+[Manage Activations](manage-activations-vamt.md)
 
  
 
diff --git a/windows/deploy/placeholder.md b/windows/deploy/placeholder.md
deleted file mode 100644
index 05ef632ece..0000000000
--- a/windows/deploy/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-#Placeholder content
\ No newline at end of file
diff --git a/windows/deploy/plan-for-volume-activation-client.md b/windows/deploy/plan-for-volume-activation-client.md
index bdf0d211b8..296b330d9f 100644
--- a/windows/deploy/plan-for-volume-activation-client.md
+++ b/windows/deploy/plan-for-volume-activation-client.md
@@ -1,7 +1,6 @@
 ---
 title: Plan for volume activation (Windows 10)
 description: Product activation is the process of validating software with the manufacturer after it has been installed on a specific computer.
-MSHAttr: PreferredLib /library
 ms.assetid: f84b005b-c362-4a70-a84e-4287c0d2e4ca
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
 ms.prod: W10
@@ -324,7 +323,7 @@ The flow of KMS activation is shown in Figure 3, and it follows this sequence:
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/plan-your-migration-usmt-win7-usmt-win8.md b/windows/deploy/plan-your-migration-usmt-win7-usmt-win8.md
index 35c0840fc4..151d6c6c93 100644
--- a/windows/deploy/plan-your-migration-usmt-win7-usmt-win8.md
+++ b/windows/deploy/plan-your-migration-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Plan Your Migration (Windows 10)
 description: Plan Your Migration
-MSHAttr: PreferredLib /library
 ms.assetid: c951f7df-850e-47ad-b31b-87f902955e3e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/prepare-for-deployment-with-mdt-2013.md b/windows/deploy/prepare-for-deployment-with-mdt-2013.md
index 5b697e7a51..11aa63cdb2 100644
--- a/windows/deploy/prepare-for-deployment-with-mdt-2013.md
+++ b/windows/deploy/prepare-for-deployment-with-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Prepare for deployment with MDT 2013 Update 1 (Windows 10)
 description: This topic will walk you through the steps necessary to create the server structure required to deploy the Windows 10 operating system using the Microsoft Deployment Toolkit (MDT) 2013 Update 1.
-MSHAttr: PreferredLib /library
 ms.assetid: 5103c418-0c61-414b-b93c-a8e8207d1226
-keywords: ["deploy system requirements"]
+keywords: ["deploy, system requirements"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,17 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [System requirements](#sec01)
--   [Install Windows ADK for Windows 10](#sec02)
--   [Install MDT 2013 Update 1](#sec03)
--   [Create the OU structure](#sec04)
--   [Create the MDT service account](#sec05)
--   [Create and share the logs folder](#sec06)
--   [Use CMTrace to read log files (optional)](#sec07)
--   [Related topics](#related-topics)
-
 This topic will walk you through the steps necessary to create the server structure required to deploy the Windows 10 operating system using the Microsoft Deployment Toolkit (MDT) 2013 Update 1. It covers the installation of the necessary system prerequisites, the creation of shared folders and service accounts, and the configuration of security permissions in the files system and in Active Directory.
 
 For the purposes of this topic, we will use two machines: DC01 and MDT01. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. MDT01 is a member of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof).
diff --git a/windows/deploy/prepare-for-zero-touch-installation-of-windows-81-with-configuration-manager.md b/windows/deploy/prepare-for-zero-touch-installation-of-windows-81-with-configuration-manager.md
index 6ca18219ff..1b4b7e6a27 100644
--- a/windows/deploy/prepare-for-zero-touch-installation-of-windows-81-with-configuration-manager.md
+++ b/windows/deploy/prepare-for-zero-touch-installation-of-windows-81-with-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Prepare for Zero Touch Installation of Windows 10 with Configuration Manager (Windows 10)
-description: This topic will walk you through the process of integrating Microsoft System Center 2012 R2 Configuration Manager SP1 with Microsoft Deployment Toolkit (MDT) 2013 Update 1 as well as the other preparations needed to deploying Windows 10 via Zero Touch Installation. Additional preparations include the installation of hotfixes as well as activities that speed up the Pre Boot Execution Environment (PXE).
-MSHAttr: PreferredLib /library
+description: This topic will walk you through the process of integrating Microsoft System Center 2012 R2 Configuration Manager SP1 with Microsoft Deployment Toolkit (MDT) 2013 Update 1, as well as the other preparations needed to deploying Windows 10 via Zero Touch Installation. Additional preparations include the installation of hotfixes as well as activities that speed up the Pre-Boot Execution Environment (PXE).
 ms.assetid: 06e3a221-31ef-47a5-b4da-3b927cb50d08
-keywords: ["install configure deploy deployment"]
+keywords: ["install, configure, deploy, deployment"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,18 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Prerequisites](#prerequisites)
--   [Create the Configuration Manager service accounts](#sec01)
--   [Configure Active Directory permissions](#sec02)
--   [Review the Sources folder structure](#sec03)
--   [Integrate Configuration Manager with MDT](#sec04)
--   [Configure the client settings](#sec06)
--   [Configure the Network Access account](#sec07)
--   [Enable PXE on the CM01 distribution point](#sec08)
--   [Related topics](#related-topics)
-
 This topic will walk you through the process of integrating Microsoft System Center 2012 R2 Configuration Manager SP1 with Microsoft Deployment Toolkit (MDT) 2013 Update 1, as well as the other preparations needed to deploying Windows 10 via Zero Touch Installation. Additional preparations include the installation of hotfixes as well as activities that speed up the Pre-Boot Execution Environment (PXE).
 
 ## Prerequisites
diff --git a/windows/deploy/perform-proxy-activation-vamt-30-win8.md b/windows/deploy/proxy-activation-vamt.md
similarity index 87%
rename from windows/deploy/perform-proxy-activation-vamt-30-win8.md
rename to windows/deploy/proxy-activation-vamt.md
index 218420e066..4a27efa617 100644
--- a/windows/deploy/perform-proxy-activation-vamt-30-win8.md
+++ b/windows/deploy/proxy-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Perform Proxy Activation (Windows 10)
 description: Perform Proxy Activation
-MSHAttr: PreferredLib /library
 ms.assetid: 35a919ed-f1cc-4d10-9c88-9bd634549dc3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -17,7 +16,7 @@ You can use the Volume Activation Management Tool (VAMT) to perform activation f
 In a typical proxy-activation scenario, the VAMT host computer distributes a MAK to one or more client computers and collects the installation ID (IID) from each computer. The VAMT host computer sends the IIDs to Microsoft on behalf of the client computers and obtains the corresponding Confirmation IDs (CIDs). The VAMT host computer then installs the CIDs on the client computer to complete the activation. Using this activation method, only the VAMT host computer needs Internet access.
 
 **Note**  
-For workgroups that are completely isolated from any larger network, you can still perform MAK, KMS Host key (CSVLK), or retail proxy activation. This requires installing a second instance of VAMT on a computer within the isolated group and using removable media to transfer activation data between that computer and another VAMT host computer that has Internet access. For more information about this scenario, see [Scenario 2: Proxy Activation](scenario-2-proxy-activation-vamt-30-win8.md). Similarly, you can proxy activate a KMS Host key (CSVLK) located in an isolated network. You can also proxy activate a KMS Host key (CSVLK) in the core network if you do not want the KMS host computer to connect to Microsoft over the Internet.
+For workgroups that are completely isolated from any larger network, you can still perform MAK, KMS Host key (CSVLK), or retail proxy activation. This requires installing a second instance of VAMT on a computer within the isolated group and using removable media to transfer activation data between that computer and another VAMT host computer that has Internet access. For more information about this scenario, see [Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md). Similarly, you can proxy activate a KMS Host key (CSVLK) located in an isolated network. You can also proxy activate a KMS Host key (CSVLK) in the core network if you do not want the KMS host computer to connect to Microsoft over the Internet.
 
  
 
@@ -28,11 +27,11 @@ Before performing proxy activation, ensure that your network and the VAMT instal
 
 -   There is an instance of VAMT that is installed on a computer that has Internet access. If you are performing proxy activation for an isolated workgroup, you also need to have VAMT installed on one of the computers in the workgroup.
 
--   The products to be activated have been added to VAMT and are installed with a retail product key, a KMS Host key (CSVLK) or a MAK. If the products have not been installed with a proper product key, refer to the steps in the [Add and Remove a Product Key](add-and-remove-a-product-key-vamt-30-win8.md) section for instructions on how to install a product key.
+-   The products to be activated have been added to VAMT and are installed with a retail product key, a KMS Host key (CSVLK) or a MAK. If the products have not been installed with a proper product key, refer to the steps in the [Add and Remove a Product Key](add-remove-product-key-vamt.md) section for instructions on how to install a product key.
 
 -   VAMT has administrative permissions on all products to be activated and Windows Management Instrumentation (WMI) is accessible through the Windows firewall.
 
--   For workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+-   For workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 The product keys that are installed on the client products must have a sufficient number of remaining activations. If you are activating a MAK key, you can retrieve the remaining number of activations for that key by selecting the MAK in the product key list in the center pane and then clicking **Refresh product key data online** in the right-side pane. This retrieves the number of remaining activations for the MAK from Microsoft. Note that this step requires Internet access and that the remaining activation count can only be retrieved for MAKs.
 
@@ -43,9 +42,9 @@ The product keys that are installed on the client products must have a sufficien
 
 2.  If necessary, install product keys. For more information see:
 
-    -   [Install a Product Key](install-a-product-key-vamt-30-win8.md) to install retail, MAK, or KMS Host key (CSVLK).
+    -   [Install a Product Key](install-product-key-vamt.md) to install retail, MAK, or KMS Host key (CSVLK).
 
-    -   [Install a KMS Client Key](install-a-kms-client-key-vamt-30-win8.md) to install GVLK (KMS client) keys.
+    -   [Install a KMS Client Key](install-kms-client-key-vamt.md) to install GVLK (KMS client) keys.
 
 3.  In the **Products** list in the center pane, select the individual products to be activated. You can use the **Filter** function to narrow your search for products by clicking **Filter** in the right-side pane to open the **Filter Products** dialog box.
 
diff --git a/windows/deploy/recognized-environment-variables-usmt-win7-usmt-win8.md b/windows/deploy/recognized-environment-variables-usmt-win7-usmt-win8.md
index e2713b4432..2984748171 100644
--- a/windows/deploy/recognized-environment-variables-usmt-win7-usmt-win8.md
+++ b/windows/deploy/recognized-environment-variables-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Recognized Environment Variables (Windows 10)
 description: Recognized Environment Variables
-MSHAttr: PreferredLib /library
 ms.assetid: 2b0ac412-e131-456e-8f0c-c26249b5f3df
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/refresh-a-windows-7-computer-with-windows-81.md b/windows/deploy/refresh-a-windows-7-computer-with-windows-81.md
index 4c9eb4679b..f73e3bbdcb 100644
--- a/windows/deploy/refresh-a-windows-7-computer-with-windows-81.md
+++ b/windows/deploy/refresh-a-windows-7-computer-with-windows-81.md
@@ -1,9 +1,8 @@
 ---
 title: Refresh a Windows 7 computer with Windows 10 (Windows 10)
 description: This topic will show you how to use MDT 2013 Update 1 Lite Touch Installation (LTI) to upgrade a Windows 7 computer to a Windows 10 computer using the computer refresh process.
-MSHAttr: PreferredLib /library
 ms.assetid: 2866fb3c-4909-4c25-b083-6fc1f7869f6f
-keywords: ["reinstallation customize template script restore"]
+keywords: ["reinstallation, customize, template, script, restore"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,13 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [The computer refresh process](#sec01)
--   [Create a custom User State Migration Tool (USMT) template](#sec02)
--   [Refresh a Windows 7 SP1 client](#sec03)
--   [Related topics](#related-topics)
-
 This topic will show you how to use MDT 2013 Update 1 Lite Touch Installation (LTI) to upgrade a Windows 7 computer to a Windows 10 computer using the computer refresh process. The refresh scenario, or computer refresh, is a reinstallation of an operating system on the same machine. You can refresh the machine to the same operating system as it is currently running, or to a later version.
 
 For the purposes of this topic, we will use three machines: DC01, MDT01, and PC0001. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 Standard server. PC0001 is a machine with Windows 7 Service Pack 1 (SP1) that is going to be refreshed into a Windows 10 machine, with data and settings restored. MDT01 and PC0001 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof).
diff --git a/windows/deploy/refresh-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md b/windows/deploy/refresh-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
index b0d89db403..4273efaefe 100644
--- a/windows/deploy/refresh-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
+++ b/windows/deploy/refresh-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager (Windows 10)
 description: This topic will show you how to use a previously created task sequence to refresh a Windows 7 SP1 client with Windows 10 using Microsoft System Center 2012 R2 Configuration Manager and Microsoft Deployment Toolkit (MDT) 2013 Update 1.
-MSHAttr: PreferredLib /library
 ms.assetid: 57c81667-1019-4711-b3de-15ae9c5387c7
-keywords: ["upgrade install installation computer refresh"]
+keywords: ["upgrade, install, installation, computer refresh"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,13 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Create a device collection and add the PC0003 computer](#sec01)
--   [Create a new deployment](#sec02)
--   [Initiate a computer refresh](#sec03)
--   [Related topics](#related-topics)
-
 This topic will show you how to use a previously created task sequence to refresh a Windows 7 SP1 client with Windows 10 using Microsoft System Center 2012 R2 Configuration Manager and Microsoft Deployment Toolkit (MDT) 2013 Update 1. When refreshing a machine to a later version, it appears as an upgrade to the end user, but technically it is not an in-place upgrade. A computer refresh also involves taking care of user data and settings from the old installation and making sure to restore those at the end of the installation. For more information, see [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-81.md).
 
 A computer refresh with System Center 2012 R2 Configuration Manager works the same as it does with MDT Lite Touch installation. Configuration Manager also uses the User State Migration Tool (USMT) from the Windows Assessment and Deployment Kit (Windows ADK) 10 in the background. A computer refresh with Configuration Manager involves the following steps:
diff --git a/windows/deploy/remove-products-vamt-30-win8.md b/windows/deploy/remove-products-vamt.md
similarity index 93%
rename from windows/deploy/remove-products-vamt-30-win8.md
rename to windows/deploy/remove-products-vamt.md
index a427cfde0f..287b0ad68e 100644
--- a/windows/deploy/remove-products-vamt-30-win8.md
+++ b/windows/deploy/remove-products-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Remove Products (Windows 10)
 description: Remove Products
-MSHAttr: PreferredLib /library
 ms.assetid: 4d44379e-dda1-4a8f-8ebf-395b6c0dad8e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -37,7 +36,7 @@ To delete one or more products:
 ## Related topics
 
 
-[Add and Manage Products](add-and-manage-products-vamt-30-win8.md)
+[Add and Manage Products](add-manage-products-vamt.md)
 
  
 
diff --git a/windows/deploy/replace-a-windows-7-computer-with-a-windows-81-computer.md b/windows/deploy/replace-a-windows-7-computer-with-a-windows-81-computer.md
index f4aa69d2f2..99894309bc 100644
--- a/windows/deploy/replace-a-windows-7-computer-with-a-windows-81-computer.md
+++ b/windows/deploy/replace-a-windows-7-computer-with-a-windows-81-computer.md
@@ -1,9 +1,8 @@
 ---
 title: Replace a Windows 7 computer with a Windows 10 computer (Windows 10)
-description: A computer replace scenario for Windows 10 is quite similar to a computer refresh for Windows 10; however because you are replacing a machine you cannot store the backup on the old computer.
-MSHAttr: PreferredLib /library
+description: A computer replace scenario for Windows 10 is quite similar to a computer refresh for Windows 10; however, because you are replacing a machine, you cannot store the backup on the old computer.
 ms.assetid: acf091c9-f8f4-4131-9845-625691c09a2a
-keywords: ["deploy deployment replace"]
+keywords: ["deploy, deployment, replace"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,12 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Prepare for the computer replace](#sec01)
--   [Perform the computer replace](#sec02)
--   [Related topics](#related-topics)
-
 A computer replace scenario for Windows 10 is quite similar to a computer refresh for Windows 10; however, because you are replacing a machine, you cannot store the backup on the old computer. Instead you need to store the backup to a location where the new computer can read it.
 
 For the purposes of this topic, we will use four machines: DC01, MDT01, PC0002, and PC0007. DC01 is a domain controller and MDT01 is a Windows Server 2012 R2 standard server. PC0002 is an old machine running Windows 7 SP1. It is going to be replaced by a new Windows 10 machine, PC0007. User State Migration Tool (USMT) will be used to backup and restore data and settings. MDT01, PC0002, and PC0007 are members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md#proof).
diff --git a/windows/deploy/replace-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md b/windows/deploy/replace-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
index 507d83085b..ee4cd4a9e7 100644
--- a/windows/deploy/replace-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
+++ b/windows/deploy/replace-a-windows-7-sp1-client-with-windows-81-using-configuration-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager (Windows 10)
-description: In this topic you will learn how to replacing a Windows 7 SP1 computer using Microsoft System Center 2012 R2 Configuration Manager.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to replacing a Windows 7 SP1 computer using Microsoft System Center 2012 R2 Configuration Manager.
 ms.assetid: 3c8a2d53-8f08-475f-923a-bca79ca8ac36
-keywords: ["upgrade install installation replace computer setup"]
+keywords: ["upgrade, install, installation, replace computer, setup"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,16 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Create a replace task sequence](#sec01)
--   [Associate the new machine with the old computer](#sec02)
--   [Create a device collection and add the PC0004 computer](#sec03)
--   [Create a new deployment](#sec04)
--   [Verify the backup](#sec05)
--   [Deploy the new computer](#sec06)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to replacing a Windows 7 SP1 computer using Microsoft System Center 2012 R2 Configuration Manager. This process is similar to refreshing a computer, but since you are replacing the machine, you have to run the backup job separately from the deployment of Windows 10.
 
 For the purposes of this topic, we will use three machines: DC01, CM01, and PC0004. DC01 is a domain controller and CM01 is a machine running Windows Server 2012 R2 Standard. PC0004 is a machine with Windows 7 SP1 that will be replaced with a new machine running Windows 10. DC01, CM01, and PC0004 are all members of the domain contoso.com for the fictitious Contoso Corporation. For more details on the setup for this topic, please see [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-81-with-the-microsoft-deployment-toolkit.md).
diff --git a/windows/deploy/reroute-files-and-settings-usmt.md b/windows/deploy/reroute-files-and-settings-usmt.md
index 4157cecd1d..cc0699e990 100644
--- a/windows/deploy/reroute-files-and-settings-usmt.md
+++ b/windows/deploy/reroute-files-and-settings-usmt.md
@@ -1,7 +1,6 @@
 ---
 title: Reroute Files and Settings (Windows 10)
 description: Reroute Files and Settings
-MSHAttr: PreferredLib /library
 ms.assetid: 905e6a24-922c-4549-9732-60fa11862a6c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/return-codes-usmt-win8.md b/windows/deploy/return-codes-usmt-win8.md
index 81cfa9a766..967a8edf1d 100644
--- a/windows/deploy/return-codes-usmt-win8.md
+++ b/windows/deploy/return-codes-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Return Codes (Windows 10)
 description: Return Codes
-MSHAttr: PreferredLib /library
 ms.assetid: e71bbc6b-d5a6-4e48-ad01-af0012b35f22
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/scanstate-syntax-usmt-win7-usmt-win8.md b/windows/deploy/scanstate-syntax-usmt-win7-usmt-win8.md
index 1823d5a622..9b5dd7f428 100644
--- a/windows/deploy/scanstate-syntax-usmt-win7-usmt-win8.md
+++ b/windows/deploy/scanstate-syntax-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: ScanState Syntax (Windows 10)
 description: ScanState Syntax
-MSHAttr: PreferredLib /library
 ms.assetid: 004c755f-33db-49e4-8a3b-37beec1480ea
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/scenario-3-kms-client-activation-vamt-30-win8.md b/windows/deploy/scenario-kms-activation-vamt.md
similarity index 92%
rename from windows/deploy/scenario-3-kms-client-activation-vamt-30-win8.md
rename to windows/deploy/scenario-kms-activation-vamt.md
index 05750402ac..f67e286e7f 100644
--- a/windows/deploy/scenario-3-kms-client-activation-vamt-30-win8.md
+++ b/windows/deploy/scenario-kms-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Scenario 3 KMS Client Activation (Windows 10)
 description: Scenario 3 KMS Client Activation
-MSHAttr: PreferredLib /library
 ms.assetid: 72b04e8f-cd35-490c-91ab-27ea799b05d0
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -12,13 +11,13 @@ author: CFaw
 # Scenario 3: KMS Client Activation
 
 
-In this scenario, you use the Volume Activation Management Tool (VAMT) to activate Key Management Service (KMS) client keys or Generic Volume License Keys (GVLKs). This can be performed on either Core Network or Isolated Lab computers. By default, volume license editions of Windows Vista, Windows® 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server® 2012, and Microsoft® Office 2010 use KMS for activation. GVLKs are already installed in volume license editions of these products. You do not have to enter a key to activate a product as a GVLK, unless you are converting a MAK-activated product to a KMS activation. For more information, see [Install a KMS Client Key](install-a-kms-client-key-vamt-30-win8.md).
+In this scenario, you use the Volume Activation Management Tool (VAMT) to activate Key Management Service (KMS) client keys or Generic Volume License Keys (GVLKs). This can be performed on either Core Network or Isolated Lab computers. By default, volume license editions of Windows Vista, Windows® 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, Windows Server® 2012, and Microsoft® Office 2010 use KMS for activation. GVLKs are already installed in volume license editions of these products. You do not have to enter a key to activate a product as a GVLK, unless you are converting a MAK-activated product to a KMS activation. For more information, see [Install a KMS Client Key](install-kms-client-key-vamt.md).
 
 The procedure that is described below assumes the following:
 
 -   The KMS Service is enabled and available to all KMS clients.
 
--   VAMT has been installed and computers have been added to the VAMT database. See Parts 1 through 4 in either [Scenario 1: Online Activation](scenario-1-online-activation-vamt-30-win8.md) or [Scenario 2: Proxy Activation](scenario-2-proxy-activation-vamt-30-win8.md) for more information.
+-   VAMT has been installed and computers have been added to the VAMT database. See Parts 1 through 4 in either [Scenario 1: Online Activation](scenario-online-activation-vamt.md) or [Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md) for more information.
 
 ## Activate KMS Clients
 
@@ -58,7 +57,7 @@ The same status is shown under the **Status of Last Action** column in the produ
 ## Related topics
 
 
-[VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)
+[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 
diff --git a/windows/deploy/scenario-1-online-activation-vamt-30-win8.md b/windows/deploy/scenario-online-activation-vamt.md
similarity index 98%
rename from windows/deploy/scenario-1-online-activation-vamt-30-win8.md
rename to windows/deploy/scenario-online-activation-vamt.md
index 8a218febbe..f8fe04980d 100644
--- a/windows/deploy/scenario-1-online-activation-vamt-30-win8.md
+++ b/windows/deploy/scenario-online-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Scenario 1 Online Activation (Windows 10)
 description: Scenario 1 Online Activation
-MSHAttr: PreferredLib /library
 ms.assetid: 94dba40e-383a-41e4-b74b-9e884facdfd3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -59,10 +58,10 @@ The Secure Zone represents higher-security Core Network computers that have addi
 ## <a href="" id="bkmk-parttwo"></a>Part 2: Configure the Windows Management Instrumentation Firewall Exception on Target Computers
 
 
--   Ensure that the Windows Management Instrumentation (WMI) firewall exception has been enabled for all target computers. For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+-   Ensure that the Windows Management Instrumentation (WMI) firewall exception has been enabled for all target computers. For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 **Note**  
-To retrieve product license status, VAMT must have administrative permissions on the remote computers and WMI must be available through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+To retrieve product license status, VAMT must have administrative permissions on the remote computers and WMI must be available through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
  
 
@@ -73,7 +72,7 @@ To retrieve product license status, VAMT must have administrative permissions on
 
 2.  Click **Connect**.
 
-3.  If you are already connected to a database, VAMT displays an inventory of the products and product keys in the center pane, and a license overview of the computers in the database. If you need to connect to a different database, click **Successfully connected to Server** to open **the Database Connection Settings** dialog box. For more information about how to create VAMT databases and adding VAMT data, see [Manage VAMT Data](manage-vamt-data-vamt-30-win8.md)
+3.  If you are already connected to a database, VAMT displays an inventory of the products and product keys in the center pane, and a license overview of the computers in the database. If you need to connect to a different database, click **Successfully connected to Server** to open **the Database Connection Settings** dialog box. For more information about how to create VAMT databases and adding VAMT data, see [Manage VAMT Data](manage-vamt-data.md)
 
 ## <a href="" id="bkmk-partfour"></a>Part 4: Discover
 
@@ -196,7 +195,7 @@ Installing a MAK and overwriting the GVLK on client products must be done with c
 ## Related topics
 
 
-[VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)
+[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 
diff --git a/windows/deploy/scenario-2-proxy-activation-vamt-30-win8.md b/windows/deploy/scenario-proxy-activation-vamt.md
similarity index 98%
rename from windows/deploy/scenario-2-proxy-activation-vamt-30-win8.md
rename to windows/deploy/scenario-proxy-activation-vamt.md
index 8f350c2d56..a981c9b7f3 100644
--- a/windows/deploy/scenario-2-proxy-activation-vamt-30-win8.md
+++ b/windows/deploy/scenario-proxy-activation-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Scenario 2 Proxy Activation (Windows 10)
 description: Scenario 2 Proxy Activation
-MSHAttr: PreferredLib /library
 ms.assetid: ed5a8a56-d9aa-4895-918f-dd1898cb2c1a
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -26,10 +25,10 @@ In this scenario, the Volume Activation Management Tool (VAMT) is used to activa
 ## Part 2: Configure the Windows Management Instrumentation Firewall Exception on Target Computers
 
 
--   Ensure that the Windows Management Instrumentation (WMI) firewall exception has been enabled for all target computers. For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+-   Ensure that the Windows Management Instrumentation (WMI) firewall exception has been enabled for all target computers. For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 **Note**  
-To retrieve the license status on the selected computers, VAMT must have administrative permissions on the remote computers and WMI must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+To retrieve the license status on the selected computers, VAMT must have administrative permissions on the remote computers and WMI must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
  
 
@@ -40,7 +39,7 @@ To retrieve the license status on the selected computers, VAMT must have adminis
 
 2.  Click **Connect**.
 
-3.  If you are already connected to a database, in the center pane VAMT displays an inventory of the products and product keys, and a license overview of the computers in the database. If you need to connect to a different database, click **Successfully connected to the Server** to open the **Database Connection Settings** dialog box. For more information about how to create VAMT databases and adding VAMT data, see [Manage VAMT Data.](manage-vamt-data-vamt-30-win8.md)
+3.  If you are already connected to a database, in the center pane VAMT displays an inventory of the products and product keys, and a license overview of the computers in the database. If you need to connect to a different database, click **Successfully connected to the Server** to open the **Database Connection Settings** dialog box. For more information about how to create VAMT databases and adding VAMT data, see [Manage VAMT Data.](manage-vamt-data.md)
 
 ## <a href="" id="part-4--discover-products-"></a>Part 4: Discover Products
 
@@ -241,7 +240,7 @@ Reapplying the same CID conserves the remaining activations on the MAK.
 ## Related topics
 
 
-[VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)
+[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)
 
  
 
diff --git a/windows/deploy/set-up-mdt-2013-for-bitlocker.md b/windows/deploy/set-up-mdt-2013-for-bitlocker.md
index 6eb48fe92f..3e192001fd 100644
--- a/windows/deploy/set-up-mdt-2013-for-bitlocker.md
+++ b/windows/deploy/set-up-mdt-2013-for-bitlocker.md
@@ -1,9 +1,8 @@
 ---
 title: Set up MDT for BitLocker (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 386e6713-5c20-4d2a-a220-a38d94671a38
 description: 
-keywords: ["disk encryption TPM configure secure script"]
+keywords: ["disk, encryption, TPM, configure, secure, script"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,13 +12,6 @@ author: CFaw
 # Set up MDT for BitLocker
 
 
-**In this article**
-
--   [Configure Active Directory for BitLocker](#sec01)
--   [Add BIOS configuration tools from Dell, HP, and Lenovo](#sec02)
--   [Configure the Windows 10 task sequence to enable BitLocker](#sec03)
--   [Related topics](#related-topics)
-
 This topic will show you how to configure your environment for BitLocker, the disk volume encryption built into Windows 10 Enterprise and Windows 10 Pro, using MDT. BitLocker in Windows 10 has two requirements in regard to an operating system deployment:
 
 -   A protector, which can either be stored in the Trusted Platform Module (TPM) chip, or stored as a password. Technically, you also can use a USB stick to store the protector, but it's not a practical approach as the USB stick can be lost or stolen. We, therefore, recommend that you instead use a TPM chip and/or a password.
diff --git a/windows/deploy/sideload-apps-in-windows-10.md b/windows/deploy/sideload-apps-in-windows-10.md
index a54083fdd3..0af76cdf58 100644
--- a/windows/deploy/sideload-apps-in-windows-10.md
+++ b/windows/deploy/sideload-apps-in-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Sideload LOB apps in Windows 10 (Windows 10)
-description: Sideload line of business apps in Windows 10.
-MSHAttr: PreferredLib /library
+description: Sideload line-of-business apps in Windows 10.
 ms.assetid: C46B27D0-375B-4F7A-800E-21595CF1D53D
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -17,12 +16,6 @@ author: CFaw
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Requirements](#requirements)
--   [How do I sideload an app on desktop](#how-do-i-sideload-an-app-on-desktop)
--   [How do I sideload an app on mobile](#how-do-i-sideload-an-app-on-mobile)
-
 Sideload line-of-business apps in Windows 10.
 
 "Line-of-Business" (LOB) apps are present in a wide range of businesses and organizations. Organizations value these apps because they solve problems unique to each business.
diff --git a/windows/deploy/simulate-a-windows-81-deployment-in-a-test-environment.md b/windows/deploy/simulate-a-windows-81-deployment-in-a-test-environment.md
index dc34d74745..3c447b6eb2 100644
--- a/windows/deploy/simulate-a-windows-81-deployment-in-a-test-environment.md
+++ b/windows/deploy/simulate-a-windows-81-deployment-in-a-test-environment.md
@@ -1,9 +1,8 @@
 ---
 title: Simulate a Windows 10 deployment in a test environment (Windows 10)
 description: This topic will walk you through the process of creating a simulated environment on which to test your Windows 10 deployment using MDT.
-MSHAttr: PreferredLib /library
 ms.assetid: 2de86c55-ced9-4078-b280-35e0329aea9c
-keywords: ["deploy script"]
+keywords: ["deploy, script,"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/deploy/test-your-migration-usmt-win7-usmt-win8.md b/windows/deploy/test-your-migration-usmt-win7-usmt-win8.md
index 4956b700f7..099ba79255 100644
--- a/windows/deploy/test-your-migration-usmt-win7-usmt-win8.md
+++ b/windows/deploy/test-your-migration-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Test Your Migration (Windows 10)
 description: Test Your Migration
-MSHAttr: PreferredLib /library
 ms.assetid: 754af276-8386-4eac-8079-3d1e45964a0d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/understanding-migration-xml-files.md b/windows/deploy/understanding-migration-xml-files.md
index 8e44fe0bff..a3e06e6d3c 100644
--- a/windows/deploy/understanding-migration-xml-files.md
+++ b/windows/deploy/understanding-migration-xml-files.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding Migration XML Files (Windows 10)
 description: Understanding Migration XML Files
-MSHAttr: PreferredLib /library
 ms.assetid: d3d1fe89-085c-4da8-9657-fd54b8bfc4b7
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/update-product-status-vamt-30-win8.md b/windows/deploy/update-product-status-vamt.md
similarity index 94%
rename from windows/deploy/update-product-status-vamt-30-win8.md
rename to windows/deploy/update-product-status-vamt.md
index 173d77cca7..fc1d23b8a4 100644
--- a/windows/deploy/update-product-status-vamt-30-win8.md
+++ b/windows/deploy/update-product-status-vamt.md
@@ -1,7 +1,6 @@
 ---
 title: Update Product Status (Windows 10)
 description: Update Product Status
-MSHAttr: PreferredLib /library
 ms.assetid: 39d4abd4-801a-4e8f-9b8c-425a24a96764
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -14,7 +13,7 @@ author: CFaw
 
 After you add computers to the VAMT database, you need to use the **Update license status** function to add the products that are installed on the computers. You can also use the **Update license status** at any time to retrieve the most current license status for any products in the VAMT database.
 
-To retrieve license status, VAMT must have administrative permissions on all selected computers and Windows Management Instrumentation (WMI) must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt-30-win8.md).
+To retrieve license status, VAMT must have administrative permissions on all selected computers and Windows Management Instrumentation (WMI) must be accessible through the Windows Firewall. In addition, for workgroup computers, a registry key must be created to enable remote administrative actions under User Account Control (UAC). For more information, see [Configure Client Computers](configure-client-computers-vamt.md).
 
 **Note**  
 The license-status query requires a valid computer name for each system queried. If the VAMT database contains computers that were added without Personally Identifiable Information, computer names will not be available for those computers, and the status for these computers will not be updated.
@@ -42,7 +41,7 @@ If a previously discovered Microsoft Office 2010 product has been uninstalled f
 ## Related topics
 
 
-[Add and Manage Products](add-and-manage-products-vamt-30-win8.md)
+[Add and Manage Products](add-manage-products-vamt.md)
 
  
 
diff --git a/windows/deploy/update-windows-10-images-with-provisioning-packages.md b/windows/deploy/update-windows-10-images-with-provisioning-packages.md
index 4091da422a..c0529db061 100644
--- a/windows/deploy/update-windows-10-images-with-provisioning-packages.md
+++ b/windows/deploy/update-windows-10-images-with-provisioning-packages.md
@@ -1,7 +1,6 @@
 ---
 title: Update Windows 10 images with provisioning packages (Windows 10)
-description: Use a provisioning package to apply settings profiles and file assets to a Windows 10 image.
-MSHAttr: PreferredLib /library
+description: Use a provisioning package to apply settings, profiles, and file assets to a Windows 10 image.
 ms.assetid: 3CA345D2-B60A-4860-A3BF-174713C3D3A6
 keywords: ["provisioning", "bulk deployment", "image"]
 ms.prod: W10
@@ -18,14 +17,6 @@ author: CFaw
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Advantages](#advantages)
--   [Create package](#create-package)
--   [Add package to image](#add-package-to-image)
--   [Learn more](#learn-more)
--   [Related topics](#related-topics)
-
 Use a provisioning package to apply settings, profiles, and file assets to a Windows 10 image.
 
 In Windows 10, you can apply a provisioning package at any time. A provisioning package can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more.
diff --git a/windows/deploy/upgrade-to-windows-10-with-system-center-configuraton-manager.md b/windows/deploy/upgrade-to-windows-10-with-system-center-configuraton-manager.md
index 020fbb49a0..c75d94d607 100644
--- a/windows/deploy/upgrade-to-windows-10-with-system-center-configuraton-manager.md
+++ b/windows/deploy/upgrade-to-windows-10-with-system-center-configuraton-manager.md
@@ -1,9 +1,8 @@
 ---
 title: Upgrade to Windows 10 with System Center Configuration Manager (Windows 10)
-description: The simplest path to upgrade PCs currently running Windows 7 Windows 8 or Windows 8.1 to Windows 10 is through an in place upgrade. You can use a System Center Configuration Manager task sequence to completely automate the process.
-MSHAttr: PreferredLib /library
+description: The simplest path to upgrade PCs currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade. You can use a System Center Configuration Manager task sequence to completely automate the process.
 ms.assetid: F8DF6191-0DB0-4EF5-A9B1-6A11D5DE4878
-keywords: ["upgrade update task sequence deploy"]
+keywords: ["upgrade, update, task sequence, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 author: CFaw
@@ -16,17 +15,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Proof-of-concept environment](#proof-of-concept-environment)
--   [Upgrade to Windows 10 with System Center 2012 R2 Configuration Manager](#upgrade-to-windows-10-with-system-center-2012-r2-configuration-manager)
--   [Create the task sequence](#create-the-task-sequence)
--   [Create a device collection](#create-a-device-collection)
--   [Deploy the Windows 10 upgrade](#deploy-the-windows-10-upgrade)
--   [Start the Windows 10 upgrade](#start-the-windows-10-upgrade)
--   [Upgrade to Windows 10 with the next version of System Center Configuration Manager](#upgrade-to-windows-10-with-the-next-version-of-system-center-configuration-manager)
--   [Related topics](#related-topics)
-
 The simplest path to upgrade PCs currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade. You can use a System Center Configuration Manager task sequence to completely automate the process.
 
 ## Proof-of-concept environment
diff --git a/windows/deploy/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md b/windows/deploy/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
index f84745de7f..64c89a6dad 100644
--- a/windows/deploy/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
+++ b/windows/deploy/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
@@ -1,9 +1,8 @@
 ---
 title: Upgrade to Windows 10 with the Microsoft Deployment Toolkit (Windows 10)
-description: The simplest path to upgrade PCs that are currently running Windows 7 Windows 8 or Windows 8.1 to Windows 10 is through an in place upgrade.
-MSHAttr: PreferredLib /library
+description: The simplest path to upgrade PCs that are currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade.
 ms.assetid: B8993151-3C1E-4F22-93F4-2C5F2771A460
-keywords: ["upgrade update task sequence deploy"]
+keywords: ["upgrade, update, task sequence, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,16 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [Proof-of-concept environment](#proof-of-concept-environment)
--   [Set up the upgrade task sequence](#set-up-the-upgrade-task-sequence)
--   [Create the MDT production deployment share](#create-the-mdt-production-deployment-share)
--   [Add Windows 10 Enterprise x64 (full source)](#add-windows-10-enterprise-x64--full-source-)
--   [Create a task sequence to upgrade to Windows 10 Enterprise](#create-a-task-sequence-to-upgrade-to-windows-10-enterprise)
--   [Perform the Windows 10 upgrade](#perform-the-windows-10-upgrade)
--   [Related topics](#related-topics)
-
 The simplest path to upgrade PCs that are currently running Windows 7, Windows 8, or Windows 8.1 to Windows 10 is through an in-place upgrade. You can use a Microsoft Deployment Toolkit (MDT) 2013 Update 1 task sequence to completely automate the process.
 
 ## Proof-of-concept environment
diff --git a/windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md b/windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md
index c3e9afd1a3..9df9a27b3d 100644
--- a/windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md
+++ b/windows/deploy/use-orchestrator-runbooks-with-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Use Orchestrator runbooks with MDT (Windows 10)
 description: This topic will show you how to integrate Microsoft System Center 2012 R2 Orchestrator with MDT to replace the existing web services that are used in deployment solutions.
-MSHAttr: PreferredLib /library
 ms.assetid: 68302780-1f6f-4a9c-9407-b14371fdce3f
-keywords: ["web services database"]
+keywords: ["web services, database"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,15 +12,6 @@ author: CFaw
 # Use Orchestrator runbooks with MDT
 
 
-**In this article**
-
--   [Orchestrator terminology](#sec01)
--   [Create a sample runbook](#sec02)
--   [Test the demo MDT runbook](#sec03)
--   [Use the MDT demo runbook from MDT](#use-the-mdt-demo-runbook-from-mdt)
--   [Run the orchestrator sample task sequence](#run-the-orchestrator-sample-task-sequence)
--   [Related topics](#related-topics)
-
 This topic will show you how to integrate Microsoft System Center 2012 R2 Orchestrator with MDT to replace the existing web services that are used in deployment solutions.
 
 MDT can integrate with System Center 2012 R2 Orchestrator, which is a component that ties the Microsoft System Center products together, as well as other products from both Microsoft and third-party vendors. The difference between using Orchestrator and "normal" web services, is that with Orchestrator you have a rich drag-and-drop style interface when building the solution, and little or no coding is required.
diff --git a/windows/deploy/use-the-mdt-database-to-stage-windows-81-deployment-information.md b/windows/deploy/use-the-mdt-database-to-stage-windows-81-deployment-information.md
index 57ffe62ba8..c8b14a303b 100644
--- a/windows/deploy/use-the-mdt-database-to-stage-windows-81-deployment-information.md
+++ b/windows/deploy/use-the-mdt-database-to-stage-windows-81-deployment-information.md
@@ -1,9 +1,8 @@
 ---
 title: Use the MDT database to stage Windows 10 deployment information (Windows 10)
-description: This topic is designed to teach you how to use the MDT database to pre stage information on your Windows 10 deployment in a Microsoft SQL Server 2012 SP1 Express database rather than include the information in a text file (CustomSettings.ini).
-MSHAttr: PreferredLib /library
+description: This topic is designed to teach you how to use the MDT database to pre-stage information on your Windows 10 deployment in a Microsoft SQL Server 2012 SP1 Express database, rather than include the information in a text file (CustomSettings.ini).
 ms.assetid: 8956ab54-90ba-45d3-a384-4fdec72c4d46
-keywords: ["database permissions settings configure deploy"]
+keywords: ["database, permissions, settings, configure, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,14 +12,6 @@ author: CFaw
 # Use the MDT database to stage Windows 10 deployment information
 
 
-**In this article**
-
--   [Database prerequisites](#sec01)
--   [Create the deployment database](#sec02)
--   [Configure database permissions](#sec03)
--   [Create an entry in the database](#sec04)
--   [Related topics](#related-topics)
-
 This topic is designed to teach you how to use the MDT database to pre-stage information on your Windows 10 deployment in a Microsoft SQL Server 2012 SP1 Express database, rather than include the information in a text file (CustomSettings.ini). You can use this process, for example, to add the client machines you want to deploy, specify their computer names and IP addresses, indicate applications to be deployed, and determine many additional settings for the machines.
 
 ## <a href="" id="sec01"></a>Database prerequisites
diff --git a/windows/deploy/use-the-volume-activation-management-tool-client.md b/windows/deploy/use-the-volume-activation-management-tool-client.md
index 3ca923d09f..96641c4068 100644
--- a/windows/deploy/use-the-volume-activation-management-tool-client.md
+++ b/windows/deploy/use-the-volume-activation-management-tool-client.md
@@ -1,7 +1,6 @@
 ---
 title: Use the Volume Activation Management Tool (Windows 10)
-description: The Volume Activation Management Tool (VAMT) provides several useful features including the ability to perform VAMT proxy activation and to track and monitor several types of product keys.
-MSHAttr: PreferredLib /library
+description: The Volume Activation Management Tool (VAMT) provides several useful features, including the ability to perform VAMT proxy activation and to track and monitor several types of product keys.
 ms.assetid: b11f0aee-7b60-44d1-be40-c960fc6c4c47
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
 ms.prod: W10
@@ -84,7 +83,7 @@ For more information, see:
 ## See also
 
 
--   [Volume Activation for Windows 10](volume-activation-for-windows-81-client.md)
+-   [Volume Activation for Windows 10](volume-activation-windows-10.md)
 
  
 
diff --git a/windows/deploy/use-vamt-in-windows-powershell.md b/windows/deploy/use-vamt-in-windows-powershell.md
index ee335064cc..2c8c5659c0 100644
--- a/windows/deploy/use-vamt-in-windows-powershell.md
+++ b/windows/deploy/use-vamt-in-windows-powershell.md
@@ -1,7 +1,6 @@
 ---
 title: Use VAMT in Windows PowerShell (Windows 10)
 description: Use VAMT in Windows PowerShell
-MSHAttr: PreferredLib /library
 ms.assetid: 13e0ceec-d827-4681-a5c3-8704349e3ba9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/use-web-services-in-mdt-2013.md b/windows/deploy/use-web-services-in-mdt-2013.md
index 8f9e2ab03c..882720abec 100644
--- a/windows/deploy/use-web-services-in-mdt-2013.md
+++ b/windows/deploy/use-web-services-in-mdt-2013.md
@@ -1,9 +1,8 @@
 ---
 title: Use web services in MDT (Windows 10)
-description: In this topic you will learn how to create a simple web service that generates computer names and then configure MDT to use that service during your Windows 10 deployment.
-MSHAttr: PreferredLib /library
+description: In this topic, you will learn how to create a simple web service that generates computer names and then configure MDT to use that service during your Windows 10 deployment.
 ms.assetid: 8f47535e-0551-4ccb-8f02-bb97539c6522
-keywords: ["deploy web apps"]
+keywords: ["deploy, web apps"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,15 +12,6 @@ author: CFaw
 # Use web services in MDT
 
 
-**In this article**
-
--   [Create a sample web service](#sec01)
--   [Create an application pool for the web service](#sec02)
--   [Install the web service](#sec03)
--   [Test the web service in Internet Explorer](#sec04)
--   [Test the web service in the MDT simulation environment](#sec05)
--   [Related topics](#related-topics)
-
 In this topic, you will learn how to create a simple web service that generates computer names and then configure MDT to use that service during your Windows 10 deployment. Web services provide a powerful way to assign settings during a deployment. Simply put, web services are web applications that run code on the server side, and MDT has built-in functions to call these web services.
 
 Using a web service in MDT is straightforward, but it does require that you have enabled the Web Server (IIS) role on the server. Developing web services involves a little bit of coding, but for most web services used with MDT, you can use the free Microsoft Visual Studio Express 2013 for Web.
diff --git a/windows/deploy/user-state-migration-tool--usmt--command-line-syntax.md b/windows/deploy/user-state-migration-tool--usmt--command-line-syntax.md
index bae2fa574d..b69af0e3f1 100644
--- a/windows/deploy/user-state-migration-tool--usmt--command-line-syntax.md
+++ b/windows/deploy/user-state-migration-tool--usmt--command-line-syntax.md
@@ -1,7 +1,6 @@
 ---
-title: User State Migration Tool (USMT) Command line Syntax (Windows 10)
-description: User State Migration Tool (USMT) Command line Syntax
-MSHAttr: PreferredLib /library
+title: User State Migration Tool (USMT) Command-line Syntax (Windows 10)
+description: User State Migration Tool (USMT) Command-line Syntax
 ms.assetid: f9d205c9-e824-46c7-8d8b-d7e4b52fd514
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md b/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md
index 9da73d4efa..2cfcc84f07 100644
--- a/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md
+++ b/windows/deploy/user-state-migration-tool--usmt--how-to-topics.md
@@ -1,7 +1,6 @@
 ---
-title: User State Migration Tool (USMT) How to topics (Windows 10)
-description: User State Migration Tool (USMT) How to topics
-MSHAttr: PreferredLib /library
+title: User State Migration Tool (USMT) How-to topics (Windows 10)
+description: User State Migration Tool (USMT) How-to topics
 ms.assetid: 7b9a2f2a-a43a-4984-9746-a767f9f1c7e3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-tool--usmt--overview-topics.md b/windows/deploy/user-state-migration-tool--usmt--overview-topics.md
index bbe80c4575..c2c71d99e7 100644
--- a/windows/deploy/user-state-migration-tool--usmt--overview-topics.md
+++ b/windows/deploy/user-state-migration-tool--usmt--overview-topics.md
@@ -1,7 +1,6 @@
 ---
 title: User State Migration Tool (USMT) Overview Topics (Windows 10)
 description: User State Migration Tool (USMT) Overview Topics
-MSHAttr: PreferredLib /library
 ms.assetid: 23170271-130b-416f-a7a7-c2f6adc32eee
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-tool--usmt--overview.md b/windows/deploy/user-state-migration-tool--usmt--overview.md
index fddc6e7438..120fde37d1 100644
--- a/windows/deploy/user-state-migration-tool--usmt--overview.md
+++ b/windows/deploy/user-state-migration-tool--usmt--overview.md
@@ -1,7 +1,6 @@
 ---
 title: User State Migration Tool (USMT) Overview (Windows 10)
 description: User State Migration Tool (USMT) Overview
-MSHAttr: PreferredLib /library
 ms.assetid: 3b649431-ad09-4b17-895a-3fec7ac0a81f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-tool--usmt--technical-reference.md b/windows/deploy/user-state-migration-tool--usmt--technical-reference.md
index 6c97bc99ab..ccad2ae060 100644
--- a/windows/deploy/user-state-migration-tool--usmt--technical-reference.md
+++ b/windows/deploy/user-state-migration-tool--usmt--technical-reference.md
@@ -1,7 +1,6 @@
 ---
 title: User State Migration Tool (USMT) Technical Reference (Windows 10)
-description: The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user profile migration experience for IT professionals.
-MSHAttr: PreferredLib /library
+description: The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user-profile migration experience for IT professionals.
 ms.assetid: f90bf58b-5529-4520-a9f8-b6cb4e4d3add
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-tool--usmt--troubleshooting.md b/windows/deploy/user-state-migration-tool--usmt--troubleshooting.md
index 742ebecb18..4e697b76a9 100644
--- a/windows/deploy/user-state-migration-tool--usmt--troubleshooting.md
+++ b/windows/deploy/user-state-migration-tool--usmt--troubleshooting.md
@@ -1,7 +1,6 @@
 ---
 title: User State Migration Tool (USMT) Troubleshooting (Windows 10)
 description: User State Migration Tool (USMT) Troubleshooting
-MSHAttr: PreferredLib /library
 ms.assetid: 770f45bb-2284-463f-a29c-69c04f437533
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/user-state-migration-toolkit--usmt--reference.md b/windows/deploy/user-state-migration-toolkit--usmt--reference.md
index 6ed51310ca..91cf434e0e 100644
--- a/windows/deploy/user-state-migration-toolkit--usmt--reference.md
+++ b/windows/deploy/user-state-migration-toolkit--usmt--reference.md
@@ -1,7 +1,6 @@
 ---
 title: User State Migration Toolkit (USMT) Reference (Windows 10)
 description: User State Migration Toolkit (USMT) Reference
-MSHAttr: PreferredLib /library
 ms.assetid: 2135dbcf-de49-4cea-b2fb-97dd016e1a1a
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/usmt-best-practices-usmt-win7-usmt-win8.md b/windows/deploy/usmt-best-practices-usmt-win7-usmt-win8.md
index dcb0ba4b91..806fbde67e 100644
--- a/windows/deploy/usmt-best-practices-usmt-win7-usmt-win8.md
+++ b/windows/deploy/usmt-best-practices-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: USMT Best Practices (Windows 10)
 description: USMT Best Practices
-MSHAttr: PreferredLib /library
 ms.assetid: e3cb1e78-4230-4eae-b179-e6e9160542d2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/usmt-requirements-usmt-win7-usmt-win8.md b/windows/deploy/usmt-requirements-usmt-win7-usmt-win8.md
index f408d012cb..db2c363e71 100644
--- a/windows/deploy/usmt-requirements-usmt-win7-usmt-win8.md
+++ b/windows/deploy/usmt-requirements-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: USMT Requirements (Windows 10)
 description: USMT Requirements
-MSHAttr: PreferredLib /library
 ms.assetid: 2b0cf3a3-9032-433f-9622-1f9df59d6806
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/usmt-resources-usmt-win8.md b/windows/deploy/usmt-resources-usmt-win8.md
index 5f80b25968..9c8debc1af 100644
--- a/windows/deploy/usmt-resources-usmt-win8.md
+++ b/windows/deploy/usmt-resources-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: USMT Resources (Windows 10)
 description: USMT Resources
-MSHAttr: PreferredLib /library
 ms.assetid: a0b266c7-4bcb-49f1-b63c-48c6ace86b43
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/usmt-xml-reference-usmt-win7-usmt-win8.md b/windows/deploy/usmt-xml-reference-usmt-win7-usmt-win8.md
index 0d30d33bd7..21a3296452 100644
--- a/windows/deploy/usmt-xml-reference-usmt-win7-usmt-win8.md
+++ b/windows/deploy/usmt-xml-reference-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: USMT XML Reference (Windows 10)
 description: USMT XML Reference
-MSHAttr: PreferredLib /library
 ms.assetid: fb946975-0fee-4ec0-b3ef-7c34945ee96f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/usmtutils-syntax-usmt-win8.md b/windows/deploy/usmtutils-syntax-usmt-win8.md
index 99a02ce146..ce45cd93e6 100644
--- a/windows/deploy/usmtutils-syntax-usmt-win8.md
+++ b/windows/deploy/usmtutils-syntax-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: UsmtUtils Syntax (Windows 10)
 description: UsmtUtils Syntax
-MSHAttr: PreferredLib /library
 ms.assetid: cdab7f2d-dd68-4016-b9ed-41ffa743b65c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/vamt-known-issues-vamt-30-win8.md b/windows/deploy/vamt-known-issues.md
similarity index 97%
rename from windows/deploy/vamt-known-issues-vamt-30-win8.md
rename to windows/deploy/vamt-known-issues.md
index a1ce3bedd7..234f0d33ed 100644
--- a/windows/deploy/vamt-known-issues-vamt-30-win8.md
+++ b/windows/deploy/vamt-known-issues.md
@@ -1,7 +1,6 @@
 ---
 title: VAMT Known Issues (Windows 10)
 description: VAMT Known Issues
-MSHAttr: PreferredLib /library
 ms.assetid: 8992f1f3-830a-4ce7-a248-f3a6377ab77f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/vamt-requirements-vamt-30-win8.md b/windows/deploy/vamt-requirements.md
similarity index 95%
rename from windows/deploy/vamt-requirements-vamt-30-win8.md
rename to windows/deploy/vamt-requirements.md
index d90d7412ff..97fd9c1c0f 100644
--- a/windows/deploy/vamt-requirements-vamt-30-win8.md
+++ b/windows/deploy/vamt-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: VAMT Requirements (Windows 10)
 description: VAMT Requirements
-MSHAttr: PreferredLib /library
 ms.assetid: d14d152b-ab8a-43cb-a8fd-2279364007b9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -88,7 +87,7 @@ The following table lists the system requirements for the VAMT host computer.
 <tr class="even">
 <td align="left"><p>Additional Requirements</p></td>
 <td align="left"><ul>
-<li><p>Connection to a SQL Server database. For more info, see [Install VAMT](install-vamt-vamt-30-win8.md).</p></li>
+<li><p>Connection to a SQL Server database. For more info, see [Install VAMT](install-vamt.md).</p></li>
 <li><p>PowerShell 3.0: For Windows 8, Windows 8.1, Windows 10, and Windows Server® 2012, PowerShell is included in the installation. For previous versions of Windows and Windows Server, you must download PowerShell 3.0. To download PowerShell, go to [Download Windows PowerShell 3.0](http://go.microsoft.com/fwlink/p/?LinkId=218356).</p></li>
 <li><p>If installing on Windows Server 2008 R2, you must also install .NET Framework 3.51.</p></li>
 </ul></td>
@@ -101,7 +100,7 @@ The following table lists the system requirements for the VAMT host computer.
 ## Related topics
 
 
-[Install and Configure VAMT](install-and-configure-vamt-vamt-30-win8.md)
+[Install and Configure VAMT](install-configure-vamt.md)
 
  
 
diff --git a/windows/deploy/vamt-step-by-step-scenarios-vamt-30-win8.md b/windows/deploy/vamt-step-by-step.md
similarity index 78%
rename from windows/deploy/vamt-step-by-step-scenarios-vamt-30-win8.md
rename to windows/deploy/vamt-step-by-step.md
index 9b87d6c5ef..f1c8048354 100644
--- a/windows/deploy/vamt-step-by-step-scenarios-vamt-30-win8.md
+++ b/windows/deploy/vamt-step-by-step.md
@@ -1,7 +1,6 @@
 ---
-title: VAMT Step by Step Scenarios (Windows 10)
-description: VAMT Step by Step Scenarios
-MSHAttr: PreferredLib /library
+title: VAMT Step-by-Step Scenarios (Windows 10)
+description: VAMT Step-by-Step Scenarios
 ms.assetid: 455c542c-4860-4b57-a1f0-7e2d28e11a10
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -24,15 +23,15 @@ This section provides step-by-step instructions on implementing the Volume Activ
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Scenario 1: Online Activation](scenario-1-online-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Scenario 1: Online Activation](scenario-online-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how to distribute Multiple Activation Keys (MAKs) to products installed on one or more connected computers within a network, and how to instruct these products to contact Microsoft over the Internet for activation.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Scenario 2: Proxy Activation](scenario-2-proxy-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Scenario 2: Proxy Activation](scenario-proxy-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how to use two VAMT host computers — the first one with Internet access and a second computer within an isolated workgroup — as proxies to perform MAK volume activation for workgroup computers that do not have Internet access.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Scenario 3: KMS Client Activation](scenario-3-kms-client-activation-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Scenario 3: KMS Client Activation](scenario-kms-activation-vamt.md)</p></td>
 <td align="left"><p>Describes how to use VAMT to configure client products for Key Management Service (KMS) activation. By default, volume license editions of Windows 10, Windows Vista, Windows® 7, Windows 8, Windows Server 2008, Windows Server 2008 R2, or Windows Server® 2012, and Microsoft® Office 2010 use KMS for activation.</p></td>
 </tr>
 </tbody>
@@ -43,7 +42,7 @@ This section provides step-by-step instructions on implementing the Volume Activ
 ## Related topics
 
 
-[Introduction to VAMT](introduction-to-vamtvamt-30-win8.md)
+[Introduction to VAMT](introduction-vamt.md)
 
  
 
diff --git a/windows/deploy/verify-the-condition-of-a-compressed-migration-store.md b/windows/deploy/verify-the-condition-of-a-compressed-migration-store.md
index 4f3e614237..cda27f1780 100644
--- a/windows/deploy/verify-the-condition-of-a-compressed-migration-store.md
+++ b/windows/deploy/verify-the-condition-of-a-compressed-migration-store.md
@@ -1,7 +1,6 @@
 ---
 title: Verify the Condition of a Compressed Migration Store (Windows 10)
 description: Verify the Condition of a Compressed Migration Store
-MSHAttr: PreferredLib /library
 ms.assetid: 4a3fda96-5f7d-494a-955f-6b865ec9fcae
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/volume-activation-management-tool--vamt--overview-vamt-30-win8.md b/windows/deploy/volume-activation-management-tool.md
similarity index 82%
rename from windows/deploy/volume-activation-management-tool--vamt--overview-vamt-30-win8.md
rename to windows/deploy/volume-activation-management-tool.md
index 52fdfbf62a..7d14740b68 100644
--- a/windows/deploy/volume-activation-management-tool--vamt--overview-vamt-30-win8.md
+++ b/windows/deploy/volume-activation-management-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Volume Activation Management Tool (VAMT) Technical Reference (Windows 10)
-description: The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows® Microsoft® Office and select other Microsoft products volume and retail activation process.
-MSHAttr: PreferredLib /library
+description: The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows®, Microsoft® Office, and select other Microsoft products volume and retail-activation process.
 ms.assetid: 1df0f795-f41c-473b-850c-e98af1ad2f2a
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -47,7 +46,7 @@ VAMT is only available in an EN-US (x86) package.
 </colgroup>
 <tbody>
 <tr class="odd">
-<td align="left"><p>[Introduction to VAMT](introduction-to-vamtvamt-30-win8.md)</p></td>
+<td align="left"><p>[Introduction to VAMT](introduction-vamt.md)</p></td>
 <td align="left"><p>Provides a description of VAMT and common usages.</p></td>
 </tr>
 <tr class="even">
@@ -55,32 +54,32 @@ VAMT is only available in an EN-US (x86) package.
 <td align="left"><p>Describes Active Directory-Based Activation scenarios.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Install and Configure VAMT](install-and-configure-vamt-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Install and Configure VAMT](install-configure-vamt.md)</p></td>
 <td align="left"><p>Describes how to install VAMT and use it to configure client computers on your network.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Add and Manage Products](add-and-manage-products-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Add and Manage Products](add-manage-products-vamt.md)</p></td>
 <td align="left"><p>Describes how to add client computers into VAMT.</p>
 <p></p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Manage Product Keys](manage-product-keys-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Manage Product Keys](manage-product-keys-vamt.md)</p></td>
 <td align="left"><p>Describes how to add and remove a product key from VAMT.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Manage Activations](manage-activations-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Manage Activations](manage-activations-vamt.md)</p></td>
 <td align="left"><p>Describes how to activate a client computer by using a variety of activation methods.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Manage VAMT Data](manage-vamt-data-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Manage VAMT Data](manage-vamt-data.md)</p></td>
 <td align="left"><p>Describes how to save, import, export, and merge a Computer Information List (CILX) file using VAMT.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[VAMT Step-by-Step Scenarios](vamt-step-by-step-scenarios-vamt-30-win8.md)</p></td>
+<td align="left"><p>[VAMT Step-by-Step Scenarios](vamt-step-by-step.md)</p></td>
 <td align="left"><p>Provides step-by-step instructions for using VAMT in typical environments.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[VAMT Known Issues](vamt-known-issues-vamt-30-win8.md)</p></td>
+<td align="left"><p>[VAMT Known Issues](vamt-known-issues.md)</p></td>
 <td align="left"><p>Lists known issues in VAMT.</p></td>
 </tr>
 </tbody>
diff --git a/windows/deploy/volume-activation-for-windows-81-client.md b/windows/deploy/volume-activation-windows-10.md
similarity index 95%
rename from windows/deploy/volume-activation-for-windows-81-client.md
rename to windows/deploy/volume-activation-windows-10.md
index 08162a9791..e57941b50a 100644
--- a/windows/deploy/volume-activation-for-windows-81-client.md
+++ b/windows/deploy/volume-activation-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Volume Activation for Windows 10 (Windows 10)
-description: This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10 including organizations that have used volume activation for earlier versions of Windows.
-MSHAttr: PreferredLib /library
+description: This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows.
 ms.assetid: 6e8cffae-7322-4fd3-882a-cde68187aef2
 keywords: ["vamt", "volume activation", "activation", "windows activation"]
 ms.prod: W10
@@ -67,11 +66,11 @@ Keep in mind that the method of activation does not change an organization’s r
 
 -   [Plan for volume activation](plan-for-volume-activation-client.md)
 
--   [Activate using Key Management Service](activate-using-key-management-service-client.md)
+-   [Activate using Key Management Service](activate-using-key-management-service-vamt.md)
 
 -   [Activate using Active Directory-based activation](activate-using-active-directory-based-activation-client.md)
 
--   [Activate clients running Windows 10](activate-clients-running-windows-81-client.md)
+-   [Activate clients running Windows 10](activate-windows-10-clients-vamt.md)
 
 -   [Monitor activation](monitor-activation-client.md)
 
diff --git a/windows/deploy/what-does-usmt-migrate-usmt-win7-usmt-win8.md b/windows/deploy/what-does-usmt-migrate-usmt-win7-usmt-win8.md
index f88c469e45..7e2d85f9a3 100644
--- a/windows/deploy/what-does-usmt-migrate-usmt-win7-usmt-win8.md
+++ b/windows/deploy/what-does-usmt-migrate-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: What Does USMT Migrate (Windows 10)
 description: What Does USMT Migrate
-MSHAttr: PreferredLib /library
 ms.assetid: f613987d-0f17-43fe-9717-6465865ceda7
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/windows-10-deployment-scenarios.md b/windows/deploy/windows-10-deployment-scenarios.md
index 1e521cccff..90bb7e6f04 100644
--- a/windows/deploy/windows-10-deployment-scenarios.md
+++ b/windows/deploy/windows-10-deployment-scenarios.md
@@ -1,9 +1,8 @@
 ---
 title: Windows 10 deployment scenarios (Windows 10)
-description: To successfully deploy the Windows 10 operating system in your organization it is important to understand the different ways that it can be deployed especially now that there are new scenarios to consider.
-MSHAttr: PreferredLib /library
+description: To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider.
 ms.assetid: 7A29D546-52CC-482C-8870-8123C7DC04B5
-keywords: ["upgrade in place configuration deploy"]
+keywords: ["upgrade, in-place, configuration, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,13 +16,6 @@ author: CFaw
 
 -   Windows 10
 
-**In this article**
-
--   [In-place upgrade](#in-place-upgrade)
--   [Dynamic provisioning](#dynamic-provisioning)
--   [Traditional deployment](#traditional-deployment)
--   [Related topics](#related-topics)
-
 To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task.
 
 ## In-place upgrade
diff --git a/windows/deploy/windows-10-deployment-tools-reference.md b/windows/deploy/windows-10-deployment-tools-reference.md
index 6040aedc49..42956d27bc 100644
--- a/windows/deploy/windows-10-deployment-tools-reference.md
+++ b/windows/deploy/windows-10-deployment-tools-reference.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 deployment tools reference (Windows 10)
 description: Learn about the tools available to deploy Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: 5C4B0AE3-B2D0-4628-9E73-606F3FAA17BB
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -38,7 +37,7 @@ Learn about the tools available to deploy Windows 10.
 <td align="left"><p>The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool--vamt--overview-vamt-30-win8.md)</p></td>
+<td align="left"><p>[Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool.md)</p></td>
 <td align="left"><p>The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows®, Microsoft® Office, and select other Microsoft products volume and retail-activation process.</p></td>
 </tr>
 <tr class="even">
diff --git a/windows/deploy/windows-10-edition-upgrades.md b/windows/deploy/windows-10-edition-upgrades.md
index a1363c9250..279e7baee6 100644
--- a/windows/deploy/windows-10-edition-upgrades.md
+++ b/windows/deploy/windows-10-edition-upgrades.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 edition upgrade (Windows 10)
-description: With Windows 10 you can quickly upgrade from one edition of Windows 10 to another provided the upgrade path is supported.
-MSHAttr: PreferredLib /library
+description: With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported.
 ms.assetid: A7642E90-A3E7-4A25-8044-C4E402DC462A
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/windows-adk-scenarios-for-it-pros.md b/windows/deploy/windows-adk-scenarios-for-it-pros.md
index 3b4491b3fd..48a13022af 100644
--- a/windows/deploy/windows-adk-scenarios-for-it-pros.md
+++ b/windows/deploy/windows-adk-scenarios-for-it-pros.md
@@ -1,7 +1,6 @@
 ---
 title: Windows ADK for Windows 10 scenarios for IT Pros (Windows 10)
 description: The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows.
-MSHAttr: PreferredLib /library
 ms.assetid: FC4EB39B-29BA-4920-87C2-A00D711AE48B
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -79,7 +78,7 @@ Here are some things you can do with Windows ICD:
 
 There are also a few tools included in the Windows ADK that are specific to IT Pros and this documentation is available on TechNet:
 
--   [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool--vamt--overview-vamt-30-win8.md)
+-   [Volume Activation Management Tool (VAMT) Technical Reference](volume-activation-management-tool.md)
 -   [User State Migration Tool (USMT) Technical Reference](user-state-migration-tool--usmt--technical-reference.md)
 
  
diff --git a/windows/deploy/windows-deployment-scenarios-and-tools.md b/windows/deploy/windows-deployment-scenarios-and-tools.md
index 61b3c6a5dd..14df54fa0c 100644
--- a/windows/deploy/windows-deployment-scenarios-and-tools.md
+++ b/windows/deploy/windows-deployment-scenarios-and-tools.md
@@ -1,9 +1,8 @@
 ---
 title: Windows 10 deployment tools (Windows 10)
-description: To successfully deploy the Windows 10 operating system and applications for your organization it is essential that you know about the available tools to help with the process.
-MSHAttr: PreferredLib /library
+description: To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process.
 ms.assetid: 0d6cee1f-14c4-4b69-b29a-43b0b327b877
-keywords: ["deploy volume activation BitLocker recovery install installation VAMT MDT USMT WDS"]
+keywords: ["deploy, volume activation, BitLocker, recovery, install, installation, VAMT, MDT, USMT, WDS"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -13,19 +12,6 @@ author: CFaw
 # Windows 10 deployment tools
 
 
-**In this article**
-
--   [Windows Assessment and Deployment Kit](#sec06)
--   [Windows Recovery Environment](#sec07)
--   [Windows Deployment Services](#sec08)
--   [Microsoft Deployment Toolkit 2013 Update 1](#sec09)
--   [Microsoft Security Compliance Manager 2013](#sec10)
--   [Microsoft Desktop Optimization Pack](#sec11)
--   [Internet Explorer Administration Kit 11](#sec12)
--   [Windows Server Update Services](#sec13)
--   [Unified Extensible Firmware Interface](#sec14)
--   [Related topics](#related-topics)
-
 To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process. In this topic, you will learn about the most commonly used tools for Windows 10 deployment.
 
 Microsoft provides many tools, services, and solutions. These tools include Windows Deployment Services (WDS), the Volume Activation Management Tool (VAMT), the User State Migration Tool (USMT), Windows System Image Manager (Windows SIM), Windows Preinstallation Environment (Windows PE), and Windows Recovery Environment (Windows RE). Keep in mind that these are just tools and not a complete solution on their own. It’s when you combine these tools with solutions like [Microsoft Deployment Toolkit (MDT) 2013 Update 1](deploy-windows-81-with-the-microsoft-deployment-toolkit.md) or [Microsoft System Center 2012 R2 Configuration Manager](deploy-windows-81-with-system-center-2012-r2-configuration-manager.md) that you get the complete deployment solution.
diff --git a/windows/deploy/windows-upgrade-and-migration-considerations-win8.md b/windows/deploy/windows-upgrade-and-migration-considerations-win8.md
index f0096a2d9d..77d98562e3 100644
--- a/windows/deploy/windows-upgrade-and-migration-considerations-win8.md
+++ b/windows/deploy/windows-upgrade-and-migration-considerations-win8.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Upgrade and Migration Considerations (Windows 10)
 description: Windows Upgrade and Migration Considerations
-MSHAttr: PreferredLib /library
 ms.assetid: 7f85095c-5922-45e9-b28e-91b1263c7281
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/xml-elements-library-usmt-win7-usmt-win8.md b/windows/deploy/xml-elements-library-usmt-win7-usmt-win8.md
index ea76d889c1..2c2624cb51 100644
--- a/windows/deploy/xml-elements-library-usmt-win7-usmt-win8.md
+++ b/windows/deploy/xml-elements-library-usmt-win7-usmt-win8.md
@@ -1,7 +1,6 @@
 ---
 title: XML Elements Library (Windows 10)
 description: XML Elements Library
-MSHAttr: PreferredLib /library
 ms.assetid: f5af0f6d-c3bf-4a4c-a0ca-9db7985f954f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/deploy/xml-file-requirements.md b/windows/deploy/xml-file-requirements.md
index 7046342723..893d8490bf 100644
--- a/windows/deploy/xml-file-requirements.md
+++ b/windows/deploy/xml-file-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: XML File Requirements (Windows 10)
 description: XML File Requirements
-MSHAttr: PreferredLib /library
 ms.assetid: 4b567b50-c50a-4a4f-8684-151fe3f8275f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md
index cdc1f32fc1..7a134f5b66 100644
--- a/windows/keep-secure/TOC.md
+++ b/windows/keep-secure/TOC.md
@@ -10,7 +10,7 @@
 ### [Prepare people to use Microsoft Passport](prepare-people-to-use-microsoft-passport.md)
 ### [Microsoft Passport and password changes](microsoft-passport-and-password-changes.md)
 ### [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md)
-### [Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+### [Event ID 300 - Passport successfully created](passport-event-300.md)
 ## [Windows Hello biometrics in the enterprise](windows-hello-biometrics-in-the-enterprise.md)
 ## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md)
 ## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md)
diff --git a/windows/keep-secure/access-credential-manager-as-a-trusted-caller.md b/windows/keep-secure/access-credential-manager-as-a-trusted-caller.md
index 0778115fc2..0a360b14e3 100644
--- a/windows/keep-secure/access-credential-manager-as-a-trusted-caller.md
+++ b/windows/keep-secure/access-credential-manager-as-a-trusted-caller.md
@@ -1,7 +1,6 @@
 ---
 title: Access Credential Manager as a trusted caller (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Access Credential Manager as a trusted caller security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Access Credential Manager as a trusted caller security policy setting.
 ms.assetid: a51820d2-ca5b-47dd-8e9b-d7008603db88
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Access Credential Manager as a trusted caller** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/access-this-computer-from-the-network.md b/windows/keep-secure/access-this-computer-from-the-network.md
index 20fadca086..0c6e340409 100644
--- a/windows/keep-secure/access-this-computer-from-the-network.md
+++ b/windows/keep-secure/access-this-computer-from-the-network.md
@@ -1,7 +1,6 @@
 ---
 title: Access this computer from the network (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Access this computer from the network security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Access this computer from the network security policy setting.
 ms.assetid: f6767bc2-83d1-45f1-847c-54f5362db022
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Access this computer from the network** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/account-lockout-duration.md b/windows/keep-secure/account-lockout-duration.md
index 71abd6d693..56ba277f4f 100644
--- a/windows/keep-secure/account-lockout-duration.md
+++ b/windows/keep-secure/account-lockout-duration.md
@@ -1,7 +1,6 @@
 ---
 title: Account lockout duration (Windows 10)
-description: Describes the best practices location values and security considerations for the Account lockout duration security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Account lockout duration security policy setting.
 ms.assetid: a4167bf4-27c3-4a9b-8ef0-04e3c6ec3aa4
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Account lockout duration** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/account-lockout-policy.md b/windows/keep-secure/account-lockout-policy.md
index 0b3ce3b8df..a8156f485c 100644
--- a/windows/keep-secure/account-lockout-policy.md
+++ b/windows/keep-secure/account-lockout-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Account Lockout Policy (Windows 10)
 description: Describes the Account Lockout Policy settings and links to information about each policy setting.
-MSHAttr: PreferredLib /library
 ms.assetid: eb968c28-17c5-405f-b413-50728cb7b724
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/account-lockout-threshold.md b/windows/keep-secure/account-lockout-threshold.md
index bb5d5490f6..93e40cfc90 100644
--- a/windows/keep-secure/account-lockout-threshold.md
+++ b/windows/keep-secure/account-lockout-threshold.md
@@ -1,7 +1,6 @@
 ---
 title: Account lockout threshold (Windows 10)
-description: Describes the best practices location values and security considerations for the Account lockout threshold security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Account lockout threshold security policy setting.
 ms.assetid: 4904bb40-a2bd-4fef-a102-260ba8d74e30
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Account lockout threshold** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/account-policies.md b/windows/keep-secure/account-policies.md
index 3e94610f74..3aab5ebc1d 100644
--- a/windows/keep-secure/account-policies.md
+++ b/windows/keep-secure/account-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Account Policies (Windows 10)
 description: An overview of account policies in Windows and provides links to policy descriptions.
-MSHAttr: PreferredLib /library
 ms.assetid: 711b3797-b87a-4cd9-a2e3-1f8ef18688fb
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/accounts-administrator-account-status.md b/windows/keep-secure/accounts-administrator-account-status.md
index 3fd280bace..280cd87d5b 100644
--- a/windows/keep-secure/accounts-administrator-account-status.md
+++ b/windows/keep-secure/accounts-administrator-account-status.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Administrator account status (Windows 10)
-description: Describes the best practices location values and security considerations for the Accounts Administrator account status security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Accounts Administrator account status security policy setting.
 ms.assetid: 71a3bd48-1014-49e0-a936-bfe9433af23e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Accounts: Administrator account status** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/accounts-block-microsoft-accounts.md b/windows/keep-secure/accounts-block-microsoft-accounts.md
index 7a5bf52bec..4326f9a355 100644
--- a/windows/keep-secure/accounts-block-microsoft-accounts.md
+++ b/windows/keep-secure/accounts-block-microsoft-accounts.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Block Microsoft accounts (Windows 10)
-description: Describes the best practices location values management and security considerations for the Accounts Block Microsoft accounts security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management, and security considerations for the Accounts Block Microsoft accounts security policy setting.
 ms.assetid: 94c76f45-057c-4d80-8d01-033cf28ef2f7
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management, and security considerations for the **Accounts: Block Microsoft accounts** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/accounts-guest-account-status.md b/windows/keep-secure/accounts-guest-account-status.md
index 892e2b64cc..8636ac74e3 100644
--- a/windows/keep-secure/accounts-guest-account-status.md
+++ b/windows/keep-secure/accounts-guest-account-status.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Guest account status (Windows 10)
-description: Describes the best practices location values and security considerations for the Accounts Guest account status security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Accounts Guest account status security policy setting.
 ms.assetid: 07e53fc5-b495-4d02-ab42-5b245d10d0ce
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Accounts: Guest account status** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md b/windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
index c288d2dfad..50c2375ce6 100644
--- a/windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
+++ b/windows/keep-secure/accounts-limit-local-account-use-of-blank-passwords-to-console-logon-only.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Limit local account use of blank passwords to console logon only (Windows 10)
-description: Describes the best practices location values and security considerations for the Accounts Limit local account use of blank passwords to console logon only security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Accounts Limit local account use of blank passwords to console logon only security policy setting.
 ms.assetid: a1bfb58b-1ae8-4de9-832b-aa889a6e64bd
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/accounts-rename-administrator-account.md b/windows/keep-secure/accounts-rename-administrator-account.md
index c402bf9611..235aa109e5 100644
--- a/windows/keep-secure/accounts-rename-administrator-account.md
+++ b/windows/keep-secure/accounts-rename-administrator-account.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Rename administrator account (Windows 10)
-description: This security policy reference topic for the IT professional describes the best practices location values and security considerations for this policy setting.
-MSHAttr: PreferredLib /library
+description: This security policy reference topic for the IT professional describes the best practices, location, values, and security considerations for this policy setting.
 ms.assetid: d21308eb-7c60-4e48-8747-62b8109844f9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 This security policy reference topic for the IT professional describes the best practices, location, values, and security considerations for this policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/accounts-rename-guest-account.md b/windows/keep-secure/accounts-rename-guest-account.md
index f468403b0c..97861315e1 100644
--- a/windows/keep-secure/accounts-rename-guest-account.md
+++ b/windows/keep-secure/accounts-rename-guest-account.md
@@ -1,7 +1,6 @@
 ---
 title: Accounts Rename guest account (Windows 10)
-description: Describes the best practices location values and security considerations for the Accounts Rename guest account security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Accounts Rename guest account security policy setting.
 ms.assetid: 9b8052b4-bbb9-4cc1-bfee-ce25390db707
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Accounts: Rename guest account** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/act-as-part-of-the-operating-system.md b/windows/keep-secure/act-as-part-of-the-operating-system.md
index 7c659233f3..7606abc181 100644
--- a/windows/keep-secure/act-as-part-of-the-operating-system.md
+++ b/windows/keep-secure/act-as-part-of-the-operating-system.md
@@ -1,7 +1,6 @@
 ---
 title: Act as part of the operating system (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Act as part of the operating system security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Act as part of the operating system security policy setting.
 ms.assetid: c1b7e084-a9f7-4377-b678-07cc913c8b0c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Act as part of the operating system** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/add-rules-for-packaged-apps-to-existing-applocker-rule-set.md b/windows/keep-secure/add-rules-for-packaged-apps-to-existing-applocker-rule-set.md
index 361f87dd98..6a390e94d9 100644
--- a/windows/keep-secure/add-rules-for-packaged-apps-to-existing-applocker-rule-set.md
+++ b/windows/keep-secure/add-rules-for-packaged-apps-to-existing-applocker-rule-set.md
@@ -1,7 +1,6 @@
 ---
-title: Add rules for packaged apps to existing AppLocker rule set (Windows 10)
+title: Add rules for packaged apps to existing AppLocker rule-set (Windows 10)
 description: This topic for IT professionals describes how to update your existing AppLocker policies for packaged apps using the Remote Server Administration Toolkit (RSAT).
-MSHAttr: PreferredLib /library
 ms.assetid: 758c2a9f-c2a3-418c-83bc-fd335a94097f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/add-workstations-to-domain.md b/windows/keep-secure/add-workstations-to-domain.md
index 6898b0e820..c16e08f043 100644
--- a/windows/keep-secure/add-workstations-to-domain.md
+++ b/windows/keep-secure/add-workstations-to-domain.md
@@ -1,7 +1,6 @@
 ---
 title: Add workstations to domain (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Add workstations to domain security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Add workstations to domain security policy setting.
 ms.assetid: b0c21af4-c928-4344-b1f1-58ef162ad0b3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Add workstations to domain** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/adjust-memory-quotas-for-a-process.md b/windows/keep-secure/adjust-memory-quotas-for-a-process.md
index 9352733e17..c49d52f51b 100644
--- a/windows/keep-secure/adjust-memory-quotas-for-a-process.md
+++ b/windows/keep-secure/adjust-memory-quotas-for-a-process.md
@@ -1,7 +1,6 @@
 ---
 title: Adjust memory quotas for a process (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Adjust memory quotas for a process security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Adjust memory quotas for a process security policy setting.
 ms.assetid: 6754a2c8-6d07-4567-9af3-335fd8dd7626
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Adjust memory quotas for a process** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/administer-applocker.md b/windows/keep-secure/administer-applocker.md
index 2f89179394..f2aa9aa68d 100644
--- a/windows/keep-secure/administer-applocker.md
+++ b/windows/keep-secure/administer-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Administer AppLocker (Windows 10)
 description: This topic for IT professionals provides links to specific procedures to use when administering AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 511a3b6a-175f-4d6d-a6e0-c1780c02e818
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/administer-security-policy-settings.md b/windows/keep-secure/administer-security-policy-settings.md
index 86a0bb9c1e..5c25499e20 100644
--- a/windows/keep-secure/administer-security-policy-settings.md
+++ b/windows/keep-secure/administer-security-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Administer security policy settings (Windows 10)
-description: This article discusses different methods to administer security policy settings on a local device or throughout a small or medium sized organization.
-MSHAttr: PreferredLib /library
+description: This article discusses different methods to administer security policy settings on a local device or throughout a small- or medium-sized organization.
 ms.assetid: 7617d885-9d28-437a-9371-171197407599
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,16 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [What’s changed in how settings are administered?](#what-s-changed-in-how-settings-are-administered-)
--   [Using the Local Security Policy snap-in](#bkmk-secpol)
--   [Using the secedit command-line tool](#bkmk-secedit)
--   [Using the Security Compliance Manager](#bkmk-scm)
--   [Using the Security Configuration Wizard](#bkmk-scw)
--   [Working with the Security Configuration Manager](#bkmk-scmtool)
--   [Working with Group Policy tools](#bkmk-grouppolicy)
-
 This article discusses different methods to administer security policy settings on a local device or throughout a small- or medium-sized organization.
 
 Security policy settings should be used as part of your overall security implementation to help secure domain controllers, servers, client devices, and other resources in your organization.
diff --git a/windows/keep-secure/advanced-security-audit-policy-settings.md b/windows/keep-secure/advanced-security-audit-policy-settings.md
index 2c64e57bff..ddf52cfa1a 100644
--- a/windows/keep-secure/advanced-security-audit-policy-settings.md
+++ b/windows/keep-secure/advanced-security-audit-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Advanced security audit policy settings (Windows 10)
 description: This reference for IT professionals provides information about the advanced audit policy settings that are available in Windows and the audit events that they generate.
-MSHAttr: PreferredLib /library
 ms.assetid: 93b28b92-796f-4036-a53b-8b9e80f9f171
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/advanced-security-auditing-faq.md b/windows/keep-secure/advanced-security-auditing-faq.md
index 1821607954..b63076029e 100644
--- a/windows/keep-secure/advanced-security-auditing-faq.md
+++ b/windows/keep-secure/advanced-security-auditing-faq.md
@@ -1,7 +1,6 @@
 ---
 title: Advanced security auditing FAQ (Windows 10)
-description: This topic for the IT professional lists questions and answers about understanding deploying and managing security audit policies.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional lists questions and answers about understanding, deploying, and managing security audit policies.
 ms.assetid: 80f8f187-0916-43c2-a7e8-ea712b115a06
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/advanced-security-auditing.md b/windows/keep-secure/advanced-security-auditing.md
index a52c7ba58b..df557dbfd4 100644
--- a/windows/keep-secure/advanced-security-auditing.md
+++ b/windows/keep-secure/advanced-security-auditing.md
@@ -1,7 +1,6 @@
 ---
 title: Advanced security audit policies (Windows 10)
-description: Advanced security audit policy settings are found in Security Settings\\Advanced Audit Policy Configuration\\System Audit Policies and appear to overlap with basic security audit policies but they are recorded and applied differently.
-MSHAttr: PreferredLib /library
+description: Advanced security audit policy settings are found in Security Settings\\Advanced Audit Policy Configuration\\System Audit Policies and appear to overlap with basic security audit policies, but they are recorded and applied differently.
 ms.assetid: 6FE8AC10-F48E-4BBF-979B-43A5DFDC5DFC
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/allow-log-on-locally.md b/windows/keep-secure/allow-log-on-locally.md
index 6c32255261..5201d11f22 100644
--- a/windows/keep-secure/allow-log-on-locally.md
+++ b/windows/keep-secure/allow-log-on-locally.md
@@ -1,7 +1,6 @@
 ---
 title: Allow log on locally (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Allow log on locally security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Allow log on locally security policy setting.
 ms.assetid: d9e5e1f3-3bff-4da7-a9a2-4bb3e0c79055
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Allow log on locally** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/allow-log-on-through-remote-desktop-services.md b/windows/keep-secure/allow-log-on-through-remote-desktop-services.md
index ede1311c92..81cc1e9800 100644
--- a/windows/keep-secure/allow-log-on-through-remote-desktop-services.md
+++ b/windows/keep-secure/allow-log-on-through-remote-desktop-services.md
@@ -1,7 +1,6 @@
 ---
 title: Allow log on through Remote Desktop Services (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Allow log on through Remote Desktop Services security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Allow log on through Remote Desktop Services security policy setting.
 ms.assetid: 6267c376-8199-4f2b-ae56-9c5424e76798
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Allow log on through Remote Desktop Services** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/applocker-architecture-and-components.md b/windows/keep-secure/applocker-architecture-and-components.md
index d57cc47377..04cbfb9e54 100644
--- a/windows/keep-secure/applocker-architecture-and-components.md
+++ b/windows/keep-secure/applocker-architecture-and-components.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker architecture and components (Windows 10)
 description: This topic for IT professional describes AppLocker’s basic architecture and its major components.
-MSHAttr: PreferredLib /library
 ms.assetid: efdd8494-553c-443f-bd5f-c8976535135a
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-functions.md b/windows/keep-secure/applocker-functions.md
index f169180c33..70f5f69402 100644
--- a/windows/keep-secure/applocker-functions.md
+++ b/windows/keep-secure/applocker-functions.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker functions (Windows 10)
 description: This topic for the IT professional lists the functions and security levels for the Software Restriction Policies (SRP) and AppLocker features.
-MSHAttr: PreferredLib /library
 ms.assetid: bf704198-9e74-4731-8c5a-ee0512df34d2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-overview-server.md b/windows/keep-secure/applocker-overview-server.md
index 960ceae206..1e78269e28 100644
--- a/windows/keep-secure/applocker-overview-server.md
+++ b/windows/keep-secure/applocker-overview-server.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker (Windows 10)
 description: This topic provides a description of AppLocker and can help you decide if your organization can benefit from deploying AppLocker application control policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 94b57864-2112-43b6-96fb-2863c985dc9a
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-policies-deployment-guide.md b/windows/keep-secure/applocker-policies-deployment-guide.md
index 3af5c1a470..5ed2981f2b 100644
--- a/windows/keep-secure/applocker-policies-deployment-guide.md
+++ b/windows/keep-secure/applocker-policies-deployment-guide.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker deployment guide (Windows 10)
 description: This topic for IT professionals introduces the concepts and describes the steps required to deploy AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 38632795-be13-46b0-a7af-487a4340bea1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-policies-design-guide.md b/windows/keep-secure/applocker-policies-design-guide.md
index 0f3ecfd206..13f4d2f528 100644
--- a/windows/keep-secure/applocker-policies-design-guide.md
+++ b/windows/keep-secure/applocker-policies-design-guide.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker design guide (Windows 10)
 description: This topic for the IT professional introduces the design and planning steps required to deploy application control policies by using AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 1c8e4a7b-3164-4eb4-9277-11b1d5a09c7b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-policy-use-scenarios.md b/windows/keep-secure/applocker-policy-use-scenarios.md
index b0ad1fd95e..6420217c2e 100644
--- a/windows/keep-secure/applocker-policy-use-scenarios.md
+++ b/windows/keep-secure/applocker-policy-use-scenarios.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker policy use scenarios (Windows 10)
 description: This topic for the IT professional lists the various application control scenarios in which AppLocker policies can be effectively implemented.
-MSHAttr: PreferredLib /library
 ms.assetid: 33f71578-89f0-4063-ac04-cf4f4ca5c31f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-processes-and-interactions.md b/windows/keep-secure/applocker-processes-and-interactions.md
index be3378993d..65ed48a32a 100644
--- a/windows/keep-secure/applocker-processes-and-interactions.md
+++ b/windows/keep-secure/applocker-processes-and-interactions.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker processes and interactions (Windows 10)
 description: This topic for the IT professional describes the process dependencies and interactions when AppLocker evaluates and enforces rules.
-MSHAttr: PreferredLib /library
 ms.assetid: 0beec616-6040-4be7-8703-b6c919755d8e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-settings.md b/windows/keep-secure/applocker-settings.md
index ee430ea2b2..03daf2f9c0 100644
--- a/windows/keep-secure/applocker-settings.md
+++ b/windows/keep-secure/applocker-settings.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker settings (Windows 10)
 description: This topic for the IT professional lists the settings used by AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 9cb4aa19-77c0-4415-9968-bd07dab86839
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/applocker-technical-reference.md b/windows/keep-secure/applocker-technical-reference.md
index 46c2d603d6..417a1e29d0 100644
--- a/windows/keep-secure/applocker-technical-reference.md
+++ b/windows/keep-secure/applocker-technical-reference.md
@@ -1,7 +1,6 @@
 ---
 title: AppLocker technical reference (Windows 10)
 description: This overview topic for IT professionals provides links to the topics in the technical reference.
-MSHAttr: PreferredLib /library
 ms.assetid: 2b2678f8-c46b-4e1d-b8c5-037c0be255ab
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/apply-a-basic-audit-policy-on-a-file-or-folder.md b/windows/keep-secure/apply-a-basic-audit-policy-on-a-file-or-folder.md
index a959b03f1c..23a70a9f8c 100644
--- a/windows/keep-secure/apply-a-basic-audit-policy-on-a-file-or-folder.md
+++ b/windows/keep-secure/apply-a-basic-audit-policy-on-a-file-or-folder.md
@@ -1,7 +1,6 @@
 ---
 title: Apply a basic audit policy on a file or folder (Windows 10)
 description: You can apply audit policies to individual files and folders on your computer by setting the permission type to record successful access attempts or failed access attempts in the security log.
-MSHAttr: PreferredLib /library
 ms.assetid: 565E7249-5CD0-4B2E-B2C0-B3A0793A51E2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-account-lockout-sec-audit.md b/windows/keep-secure/audit-account-lockout-sec-audit.md
index 071e21f39e..0731e562be 100644
--- a/windows/keep-secure/audit-account-lockout-sec-audit.md
+++ b/windows/keep-secure/audit-account-lockout-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Account Lockout (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Account Lockout which enables you to audit security events that are generated by a failed attempt to log on to an account that is locked out.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Account Lockout, which enables you to audit security events that are generated by a failed attempt to log on to an account that is locked out.
 ms.assetid: da68624b-a174-482c-9bc5-ddddab38e589
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-application-generated.md b/windows/keep-secure/audit-application-generated.md
index 546d8453a7..5fac3e3ba7 100644
--- a/windows/keep-secure/audit-application-generated.md
+++ b/windows/keep-secure/audit-application-generated.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Application Generated (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Application Generated which determines whether the operating system generates audit events when applications attempt to use the Windows Auditing application programming interfaces (APIs).
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Application Generated, which determines whether the operating system generates audit events when applications attempt to use the Windows Auditing application programming interfaces (APIs).
 ms.assetid: 6c58a365-b25b-42b8-98ab-819002e31871
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-application-group-management.md b/windows/keep-secure/audit-application-group-management.md
index 4af8dbc00c..1dbeea62df 100644
--- a/windows/keep-secure/audit-application-group-management.md
+++ b/windows/keep-secure/audit-application-group-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Application Group Management (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Application Group Management which determines whether the operating system generates audit events when application group management tasks are performed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Application Group Management, which determines whether the operating system generates audit events when application group management tasks are performed.
 ms.assetid: 1bcaa41e-5027-4a86-96b7-f04eaf1c0606
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-audit-policy-change.md b/windows/keep-secure/audit-audit-policy-change.md
index 586b159980..70984b9dcc 100644
--- a/windows/keep-secure/audit-audit-policy-change.md
+++ b/windows/keep-secure/audit-audit-policy-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Audit Policy Change (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Audit Policy Change which determines whether the operating system generates audit events when changes are made to audit policy.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Audit Policy Change, which determines whether the operating system generates audit events when changes are made to audit policy.
 ms.assetid: 7153bf75-6978-4d7e-a821-59a699efb8a9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md b/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md
index cd4a368c24..f8ad7650f0 100644
--- a/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md
+++ b/windows/keep-secure/audit-audit-the-access-of-global-system-objects.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Audit the access of global system objects (Windows 10)
-description: Describes the best practices location values and security considerations for the Audit Audit the access of global system objects security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Audit Audit the access of global system objects security policy setting.
 ms.assetid: 20d40a79-ce89-45e6-9bb4-148f83958460
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Audit: Audit the access of global system objects** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md b/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md
index 93958acd0a..7adb7d2558 100644
--- a/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md
+++ b/windows/keep-secure/audit-audit-the-use-of-backup-and-restore-privilege.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Audit the use of Backup and Restore privilege (Windows 10)
-description: Describes the best practices location values and security considerations for the Audit Audit the use of Backup and Restore privilege security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Audit Audit the use of Backup and Restore privilege security policy setting.
 ms.assetid: f656a2bb-e8d6-447b-8902-53df3a7756c5
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Audit: Audit the use of Backup and Restore privilege** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/audit-authentication-policy-change.md b/windows/keep-secure/audit-authentication-policy-change.md
index 14daf0a2d4..2a5dc7e290 100644
--- a/windows/keep-secure/audit-authentication-policy-change.md
+++ b/windows/keep-secure/audit-authentication-policy-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Authentication Policy Change (Windows 10)
-description: This topic for the IT professional describes this Advanced Security Audit policy setting Audit Authentication Policy Change which determines whether the operating system generates audit events when changes are made to authentication policy.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes this Advanced Security Audit policy setting, Audit Authentication Policy Change, which determines whether the operating system generates audit events when changes are made to authentication policy.
 ms.assetid: aa9cea7a-aadf-47b7-b704-ac253b8e79be
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-authorization-policy-change.md b/windows/keep-secure/audit-authorization-policy-change.md
index 4a71e46998..0194d0a071 100644
--- a/windows/keep-secure/audit-authorization-policy-change.md
+++ b/windows/keep-secure/audit-authorization-policy-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Authorization Policy Change (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Authorization Policy Change which determines whether the operating system generates audit events when specific changes are made to the authorization policy.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Authorization Policy Change, which determines whether the operating system generates audit events when specific changes are made to the authorization policy.
 ms.assetid: ca0587a2-a2b3-4300-aa5d-48b4553c3b36
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-central-access-policy-staging.md b/windows/keep-secure/audit-central-access-policy-staging.md
index 6dfc58adbd..61ee3a28e8 100644
--- a/windows/keep-secure/audit-central-access-policy-staging.md
+++ b/windows/keep-secure/audit-central-access-policy-staging.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Central Access Policy Staging (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Central Access Policy Staging which determines permissions on a Central Access Policy.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Central Access Policy Staging, which determines permissions on a Central Access Policy.
 ms.assetid: D9BB11CE-949A-4B48-82BF-30DC5E6FC67D
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-certification-services.md b/windows/keep-secure/audit-certification-services.md
index 08187685fe..ea8af0a656 100644
--- a/windows/keep-secure/audit-certification-services.md
+++ b/windows/keep-secure/audit-certification-services.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Certification Services (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Certification Services which determines whether the operating system generates events when Active Directory Certificate Services (AD CS) operations are performed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Certification Services, which determines whether the operating system generates events when Active Directory Certificate Services (AD CS) operations are performed.
 ms.assetid: cdefc34e-fb1f-4eff-b766-17713c5a1b03
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-computer-account-management.md b/windows/keep-secure/audit-computer-account-management.md
index 6c32ec4e59..a461349a08 100644
--- a/windows/keep-secure/audit-computer-account-management.md
+++ b/windows/keep-secure/audit-computer-account-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Computer Account Management (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Computer Account Management which determines whether the operating system generates audit events when a computer account is created changed or deleted.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Computer Account Management, which determines whether the operating system generates audit events when a computer account is created, changed, or deleted.
 ms.assetid: 6c406693-57bf-4411-bb6c-ff83ce548991
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-credential-validation.md b/windows/keep-secure/audit-credential-validation.md
index f3e7d02c8f..3a0818f62d 100644
--- a/windows/keep-secure/audit-credential-validation.md
+++ b/windows/keep-secure/audit-credential-validation.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Credential Validation (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Credential Validation which determines whether the operating system generates audit events on credentials that are submitted for a user account logon request.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Credential Validation, which determines whether the operating system generates audit events on credentials that are submitted for a user account logon request.
 ms.assetid: 6654b33a-922e-4a43-8223-ec5086dfc926
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-detailed-directory-service-replication.md b/windows/keep-secure/audit-detailed-directory-service-replication.md
index 80a3d158f7..058f7ae1f1 100644
--- a/windows/keep-secure/audit-detailed-directory-service-replication.md
+++ b/windows/keep-secure/audit-detailed-directory-service-replication.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Detailed Directory Service Replication (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Detailed Directory Service Replication which determines whether the operating system generates audit events that contain detailed tracking information about data that is replicated between domain controllers.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Detailed Directory Service Replication, which determines whether the operating system generates audit events that contain detailed tracking information about data that is replicated between domain controllers.
 ms.assetid: 1b89c8f5-bce7-4b20-8701-42585c7ab993
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-detailed-file-share-sec-audit.md b/windows/keep-secure/audit-detailed-file-share-sec-audit.md
index 7366d6e647..fc3a48ffb3 100644
--- a/windows/keep-secure/audit-detailed-file-share-sec-audit.md
+++ b/windows/keep-secure/audit-detailed-file-share-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Detailed File Share (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Detailed File Share which allows you to audit attempts to access files and folders on a shared folder.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Detailed File Share, which allows you to audit attempts to access files and folders on a shared folder.
 ms.assetid: 60310104-b820-4033-a1cb-022a34f064ae
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-directory-service-access.md b/windows/keep-secure/audit-directory-service-access.md
index 600e564fa6..5977f8db1c 100644
--- a/windows/keep-secure/audit-directory-service-access.md
+++ b/windows/keep-secure/audit-directory-service-access.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Directory Service Access (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Directory Service Access which determines whether the operating system generates audit events when an Active Directory Domain Services (AD DS) object is accessed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Access, which determines whether the operating system generates audit events when an Active Directory Domain Services (AD DS) object is accessed.
 ms.assetid: ba2562ba-4282-4588-b87c-a3fcb771c7d0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-directory-service-changes.md b/windows/keep-secure/audit-directory-service-changes.md
index ca045be233..5eb81446dc 100644
--- a/windows/keep-secure/audit-directory-service-changes.md
+++ b/windows/keep-secure/audit-directory-service-changes.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Directory Service Changes (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Directory Service Changes which determines whether the operating system generates audit events when changes are made to objects in Active Directory Domain Services (AD DS).
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Changes, which determines whether the operating system generates audit events when changes are made to objects in Active Directory Domain Services (AD DS).
 ms.assetid: 9f7c0dd4-3977-47dd-a0fb-ec2f17cad05e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-directory-service-replication.md b/windows/keep-secure/audit-directory-service-replication.md
index 174d4f07c5..c316768163 100644
--- a/windows/keep-secure/audit-directory-service-replication.md
+++ b/windows/keep-secure/audit-directory-service-replication.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Directory Service Replication (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Directory Service Replication which determines whether the operating system generates audit events when replication between two domain controllers begins and ends.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Directory Service Replication, which determines whether the operating system generates audit events when replication between two domain controllers begins and ends.
 ms.assetid: b95d296c-7993-4e8d-8064-a8bbe284bd56
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-distribution-group-management.md b/windows/keep-secure/audit-distribution-group-management.md
index 0a7bc91711..7dcf6a5049 100644
--- a/windows/keep-secure/audit-distribution-group-management.md
+++ b/windows/keep-secure/audit-distribution-group-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Distribution Group Management (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Distribution Group Management which determines whether the operating system generates audit events for specific distribution group management tasks.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Distribution Group Management, which determines whether the operating system generates audit events for specific distribution-group management tasks.
 ms.assetid: d46693a4-5887-4a58-85db-2f6cba224a66
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-dpapi-activity.md b/windows/keep-secure/audit-dpapi-activity.md
index e9afd685fb..310cb480c6 100644
--- a/windows/keep-secure/audit-dpapi-activity.md
+++ b/windows/keep-secure/audit-dpapi-activity.md
@@ -1,7 +1,6 @@
 ---
 title: Audit DPAPI Activity (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit DPAPI Activity which determines whether the operating system generates audit events when encryption or decryption calls are made into the data protection application interface (DPAPI).
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit DPAPI Activity, which determines whether the operating system generates audit events when encryption or decryption calls are made into the data protection application interface (DPAPI).
 ms.assetid: be4d4c83-c857-4e3d-a84e-8bcc3f2c99cd
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-file-share.md b/windows/keep-secure/audit-file-share.md
index af55fd4e7c..9eb592c046 100644
--- a/windows/keep-secure/audit-file-share.md
+++ b/windows/keep-secure/audit-file-share.md
@@ -1,7 +1,6 @@
 ---
 title: Audit File Share (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit File Share which determines whether the operating system generates audit events when a file share is accessed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit File Share, which determines whether the operating system generates audit events when a file share is accessed.
 ms.assetid: 9ea985f8-8936-4b79-abdb-35cbb7138f78
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-file-system.md b/windows/keep-secure/audit-file-system.md
index 929c4b0207..66dfba0a30 100644
--- a/windows/keep-secure/audit-file-system.md
+++ b/windows/keep-secure/audit-file-system.md
@@ -1,7 +1,6 @@
 ---
 title: Audit File System (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit File System which determines whether the operating system generates audit events when users attempt to access file system objects.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit File System, which determines whether the operating system generates audit events when users attempt to access file system objects.
 ms.assetid: 6a71f283-b8e5-41ac-b348-0b7ec6ea0b1f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-filtering-platform-connection.md b/windows/keep-secure/audit-filtering-platform-connection.md
index 169d2255ae..eac628b63b 100644
--- a/windows/keep-secure/audit-filtering-platform-connection.md
+++ b/windows/keep-secure/audit-filtering-platform-connection.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Filtering Platform Connection (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Filtering Platform Connection which determines whether the operating system generates audit events when connections are allowed or blocked by the Windows Filtering Platform.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Connection, which determines whether the operating system generates audit events when connections are allowed or blocked by the Windows Filtering Platform.
 ms.assetid: d72936e9-ff01-4d18-b864-a4958815df59
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-filtering-platform-packet-drop-sec-audit.md b/windows/keep-secure/audit-filtering-platform-packet-drop-sec-audit.md
index 94b59f370c..2390c68fdd 100644
--- a/windows/keep-secure/audit-filtering-platform-packet-drop-sec-audit.md
+++ b/windows/keep-secure/audit-filtering-platform-packet-drop-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Filtering Platform Packet Drop (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Filtering Platform Packet Drop which determines whether the operating system generates audit events when packets are dropped by the Windows Filtering Platform.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Packet Drop, which determines whether the operating system generates audit events when packets are dropped by the Windows Filtering Platform.
 ms.assetid: 95457601-68d1-4385-af20-87916ddab906
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-filtering-platform-policy-change.md b/windows/keep-secure/audit-filtering-platform-policy-change.md
index 6b2cc1ec38..98335becd4 100644
--- a/windows/keep-secure/audit-filtering-platform-policy-change.md
+++ b/windows/keep-secure/audit-filtering-platform-policy-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Filtering Platform Policy Change (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Filtering Platform Policy Change which determines whether the operating system generates audit events for certain IPsec and Windows Filtering Platform actions.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Filtering Platform Policy Change, which determines whether the operating system generates audit events for certain IPsec and Windows Filtering Platform actions.
 ms.assetid: 0eaf1c56-672b-4ea9-825a-22dc03eb4041
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md b/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md
index 107b95f72e..4ebdec9654 100644
--- a/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md
+++ b/windows/keep-secure/audit-force-audit-policy-subcategory-settings-to-override.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings (Windows 10)
-description: Describes the best practices location values and security considerations for the Audit Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Audit Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings security policy setting.
 ms.assetid: 8ddc06bc-b6d6-4bac-9051-e0d77035bd4e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/audit-group-membership.md b/windows/keep-secure/audit-group-membership.md
index 1370f18bc8..d135909f8c 100644
--- a/windows/keep-secure/audit-group-membership.md
+++ b/windows/keep-secure/audit-group-membership.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Group Membership (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Group Membership which enables you to audit group memberships when they are enumerated on the client PC.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Group Membership, which enables you to audit group memberships when they are enumerated on the client PC.
 ms.assetid: 1CD7B014-FBD9-44B9-9274-CC5715DE58B9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-handle-manipulation.md b/windows/keep-secure/audit-handle-manipulation.md
index 4b6c54c5ac..e54f17a6f2 100644
--- a/windows/keep-secure/audit-handle-manipulation.md
+++ b/windows/keep-secure/audit-handle-manipulation.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Handle Manipulation (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Handle Manipulation which determines whether the operating system generates audit events when a handle to an object is opened or closed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Handle Manipulation, which determines whether the operating system generates audit events when a handle to an object is opened or closed.
 ms.assetid: 1fbb004a-ccdc-4c80-b3da-a4aa7a9f4091
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-ipsec-driver.md b/windows/keep-secure/audit-ipsec-driver.md
index 72b578d14a..8945926bb1 100644
--- a/windows/keep-secure/audit-ipsec-driver.md
+++ b/windows/keep-secure/audit-ipsec-driver.md
@@ -1,7 +1,6 @@
 ---
 title: Audit IPsec Driver (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit IPsec Driver which determines whether the operating system generates audit events for the activities of the IPsec driver.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit IPsec Driver, which determines whether the operating system generates audit events for the activities of the IPsec driver.
 ms.assetid: c8b8c02f-5ad0-4ee5-9123-ea8cdae356a5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-ipsec-extended-mode.md b/windows/keep-secure/audit-ipsec-extended-mode.md
index 6900aa4832..22d1af6a85 100644
--- a/windows/keep-secure/audit-ipsec-extended-mode.md
+++ b/windows/keep-secure/audit-ipsec-extended-mode.md
@@ -1,7 +1,6 @@
 ---
 title: Audit IPsec Extended Mode (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit IPsec Extended Mode which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Extended Mode negotiations.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Extended Mode, which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Extended Mode negotiations.
 ms.assetid: 2b4fee9e-482a-4181-88a8-6a79d8fc8049
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-ipsec-main-mode.md b/windows/keep-secure/audit-ipsec-main-mode.md
index dc28bf3771..fb2d8b42d3 100644
--- a/windows/keep-secure/audit-ipsec-main-mode.md
+++ b/windows/keep-secure/audit-ipsec-main-mode.md
@@ -1,7 +1,6 @@
 ---
 title: Audit IPsec Main Mode (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit IPsec Main Mode which determines whether the operating system generates events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Main Mode negotiations.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Main Mode, which determines whether the operating system generates events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Main Mode negotiations.
 ms.assetid: 06ed26ec-3620-4ef4-a47a-c70df9c8827b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-ipsec-quick-mode.md b/windows/keep-secure/audit-ipsec-quick-mode.md
index 5e7846cc19..dbbd645b9e 100644
--- a/windows/keep-secure/audit-ipsec-quick-mode.md
+++ b/windows/keep-secure/audit-ipsec-quick-mode.md
@@ -1,7 +1,6 @@
 ---
 title: Audit IPsec Quick Mode (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit IPsec Quick Mode which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Quick Mode negotiations.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit IPsec Quick Mode, which determines whether the operating system generates audit events for the results of the Internet Key Exchange (IKE) protocol and Authenticated Internet Protocol (AuthIP) during Quick Mode negotiations.
 ms.assetid: 7be67a15-c2ce-496a-9719-e25ac7699114
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-kerberos-authentication-service-sec-audit.md b/windows/keep-secure/audit-kerberos-authentication-service-sec-audit.md
index f105c9b375..aaa0076939 100644
--- a/windows/keep-secure/audit-kerberos-authentication-service-sec-audit.md
+++ b/windows/keep-secure/audit-kerberos-authentication-service-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Kerberos Authentication Service (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Kerberos Authentication Service which determines whether to generate audit events for Kerberos authentication ticket granting ticket (TGT) requests.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kerberos Authentication Service, which determines whether to generate audit events for Kerberos authentication ticket-granting ticket (TGT) requests.
 ms.assetid: 990dd6d9-1a1f-4cce-97ba-5d7e0a7db859
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-kerberos-service-ticket-operations.md b/windows/keep-secure/audit-kerberos-service-ticket-operations.md
index fdb2ca8aef..ccd1d1a83b 100644
--- a/windows/keep-secure/audit-kerberos-service-ticket-operations.md
+++ b/windows/keep-secure/audit-kerberos-service-ticket-operations.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Kerberos Service Ticket Operations (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Kerberos Service Ticket Operations which determines whether the operating system generates security audit events for Kerberos service ticket requests.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kerberos Service Ticket Operations, which determines whether the operating system generates security audit events for Kerberos service ticket requests.
 ms.assetid: ddc0abef-ac7f-4849-b90d-66700470ccd6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-kernel-object-sec-audit.md b/windows/keep-secure/audit-kernel-object-sec-audit.md
index e3949e1989..8eec2824ea 100644
--- a/windows/keep-secure/audit-kernel-object-sec-audit.md
+++ b/windows/keep-secure/audit-kernel-object-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Kernel Object (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Kernel Object which determines whether the operating system generates audit events when users attempt to access the system kernel which includes mutexes and semaphores.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Kernel Object, which determines whether the operating system generates audit events when users attempt to access the system kernel, which includes mutexes and semaphores.
 ms.assetid: 75619d8b-b1eb-445b-afc9-0f9053be97fb
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-logoff.md b/windows/keep-secure/audit-logoff.md
index 7c6ecbeab2..fca6ed6c10 100644
--- a/windows/keep-secure/audit-logoff.md
+++ b/windows/keep-secure/audit-logoff.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Logoff (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Logoff which determines whether the operating system generates audit events when logon sessions are terminated.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Logoff, which determines whether the operating system generates audit events when logon sessions are terminated.
 ms.assetid: 681e51f2-ba06-46f5-af8c-d9c48d515432
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-logon.md b/windows/keep-secure/audit-logon.md
index 18ce8a204c..581f4860fe 100644
--- a/windows/keep-secure/audit-logon.md
+++ b/windows/keep-secure/audit-logon.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Logon (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Logon which determines whether the operating system generates audit events when a user attempts to log on to a computer.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Logon, which determines whether the operating system generates audit events when a user attempts to log on to a computer.
 ms.assetid: ca968d03-7d52-48c4-ba0e-2bcd2937231b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md b/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md
index 5a90bc0b9a..f448d5882b 100644
--- a/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md
+++ b/windows/keep-secure/audit-mpssvc-rule-level-policy-change.md
@@ -1,7 +1,6 @@
 ---
-title: Audit MPSSVC Rule Level Policy Change (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit MPSSVC Rule Level Policy Change which determines whether the operating system generates audit events when changes are made to policy rules for the Microsoft Protection Service (MPSSVC.exe).
-MSHAttr: PreferredLib /library
+title: Audit MPSSVC Rule-Level Policy Change (Windows 10)
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit MPSSVC Rule-Level Policy Change, which determines whether the operating system generates audit events when changes are made to policy rules for the Microsoft Protection Service (MPSSVC.exe).
 ms.assetid: 263461b3-c61c-4ec3-9dee-851164845019
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-network-policy-server.md b/windows/keep-secure/audit-network-policy-server.md
index e8df9ad9b0..0901a69905 100644
--- a/windows/keep-secure/audit-network-policy-server.md
+++ b/windows/keep-secure/audit-network-policy-server.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Network Policy Server (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Network Policy Server which determines whether the operating system generates audit events for RADIUS (IAS) and Network Access Protection (NAP) activity on user access requests (Grant Deny Discard Quarantine Lock and Unlock).
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Network Policy Server, which determines whether the operating system generates audit events for RADIUS (IAS) and Network Access Protection (NAP) activity on user access requests (Grant, Deny, Discard, Quarantine, Lock, and Unlock).
 ms.assetid: 43b2aea4-26df-46da-b761-2b30f51a80f7
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-non-sensitive-privilege-use-sec-audit.md b/windows/keep-secure/audit-non-sensitive-privilege-use-sec-audit.md
index c72ec9a871..ac2879b686 100644
--- a/windows/keep-secure/audit-non-sensitive-privilege-use-sec-audit.md
+++ b/windows/keep-secure/audit-non-sensitive-privilege-use-sec-audit.md
@@ -1,7 +1,6 @@
 ---
-title: Audit Non Sensitive Privilege Use (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Non Sensitive Privilege Use which determines whether the operating system generates audit events when non sensitive privileges (user rights) are used.
-MSHAttr: PreferredLib /library
+title: Audit Non-Sensitive Privilege Use (Windows 10)
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Non-Sensitive Privilege Use, which determines whether the operating system generates audit events when non-sensitive privileges (user rights) are used.
 ms.assetid: 8fd74783-1059-443e-aa86-566d78606627
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-account-logon-events-sec-audit.md b/windows/keep-secure/audit-other-account-logon-events-sec-audit.md
index 15ba4c751c..36d1c35cf5 100644
--- a/windows/keep-secure/audit-other-account-logon-events-sec-audit.md
+++ b/windows/keep-secure/audit-other-account-logon-events-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Account Logon Events (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Other Account Logon Events which allows you to audit events generated by responses to credential requests submitted for a user account logon that are not credential validation or Kerberos tickets.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Other Account Logon Events, which allows you to audit events generated by responses to credential requests submitted for a user account logon that are not credential validation or Kerberos tickets.
 ms.assetid: c8c6bfe0-33d2-4600-bb1a-6afa840d75b3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-account-management-events.md b/windows/keep-secure/audit-other-account-management-events.md
index 1c8a8627b5..78a7da62bd 100644
--- a/windows/keep-secure/audit-other-account-management-events.md
+++ b/windows/keep-secure/audit-other-account-management-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Account Management Events (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Other Account Management Events which determines whether the operating system generates user account management audit events.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Account Management Events, which determines whether the operating system generates user account management audit events.
 ms.assetid: 4ce22eeb-a96f-4cf9-a46d-6642961a31d5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-logonlogoff-events.md b/windows/keep-secure/audit-other-logonlogoff-events.md
index efcd68f043..c38d1fcc1a 100644
--- a/windows/keep-secure/audit-other-logonlogoff-events.md
+++ b/windows/keep-secure/audit-other-logonlogoff-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Logon/Logoff Events (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Other Logon/Logoff Events which determines whether Windows generates audit events for other logon or logoff events.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Logon/Logoff Events, which determines whether Windows generates audit events for other logon or logoff events.
 ms.assetid: 76d987cd-1917-4907-a739-dd642609a458
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-object-access-events.md b/windows/keep-secure/audit-other-object-access-events.md
index e93fb49c95..4998656c13 100644
--- a/windows/keep-secure/audit-other-object-access-events.md
+++ b/windows/keep-secure/audit-other-object-access-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Object Access Events (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Other Object Access Events which determines whether the operating system generates audit events for the management of Task Scheduler jobs or COM+ objects.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Object Access Events, which determines whether the operating system generates audit events for the management of Task Scheduler jobs or COM+ objects.
 ms.assetid: b9774595-595d-4199-b0c5-8dbc12b6c8b2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-policy-change-events.md b/windows/keep-secure/audit-other-policy-change-events.md
index c9193a37f8..33f1800b16 100644
--- a/windows/keep-secure/audit-other-policy-change-events.md
+++ b/windows/keep-secure/audit-other-policy-change-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Policy Change Events (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Other Policy Change Events which determines whether the operating system generates audit events for security policy changes that are not otherwise audited in the Policy Change category.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other Policy Change Events, which determines whether the operating system generates audit events for security policy changes that are not otherwise audited in the Policy Change category.
 ms.assetid: 8618502e-c21c-41cc-8a49-3dc1eb359e60
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-privilege-use-events-sec-audit.md b/windows/keep-secure/audit-other-privilege-use-events-sec-audit.md
index 719f3338c0..65b5146b7b 100644
--- a/windows/keep-secure/audit-other-privilege-use-events-sec-audit.md
+++ b/windows/keep-secure/audit-other-privilege-use-events-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other Privilege Use Events (Windows 10)
 description: This security policy setting is not used.
-MSHAttr: PreferredLib /library
 ms.assetid: 5f7f5b25-42a6-499f-8aa2-01ac79a2a63c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-other-system-events.md b/windows/keep-secure/audit-other-system-events.md
index 94eea78bfd..9b5457b2a3 100644
--- a/windows/keep-secure/audit-other-system-events.md
+++ b/windows/keep-secure/audit-other-system-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Other System Events (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Other System Events which determines whether the operating system audits various system events.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Other System Events, which determines whether the operating system audits various system events.
 ms.assetid: 2401e4cc-d94e-41ec-82a7-e10914295f8b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-pnp-activity.md b/windows/keep-secure/audit-pnp-activity.md
index 0dcb74b2bb..d0e58e4a20 100644
--- a/windows/keep-secure/audit-pnp-activity.md
+++ b/windows/keep-secure/audit-pnp-activity.md
@@ -1,7 +1,6 @@
 ---
 title: Audit PNP Activity (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit PNP Activity which determines when plug and play detects an external device.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit PNP Activity, which determines when plug and play detects an external device.
 ms.assetid: A3D87B3B-EBBE-442A-953B-9EB75A5F600E
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-policy.md b/windows/keep-secure/audit-policy.md
index 36df001a9e..dcc18d3d44 100644
--- a/windows/keep-secure/audit-policy.md
+++ b/windows/keep-secure/audit-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Policy (Windows 10)
 description: Provides information about basic audit policies that are available in Windows and links to information about each setting.
-MSHAttr: PreferredLib /library
 ms.assetid: 2e8ea400-e555-43e5-89d6-0898cb89da90
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-process-creation.md b/windows/keep-secure/audit-process-creation.md
index 8cb573d6fa..217836dc17 100644
--- a/windows/keep-secure/audit-process-creation.md
+++ b/windows/keep-secure/audit-process-creation.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Process Creation (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Process Creation which determines whether the operating system generates audit events when a process is created (starts).
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Process Creation, which determines whether the operating system generates audit events when a process is created (starts).
 ms.assetid: 67e39fcd-ded6-45e8-b1b6-d411e4e93019
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-process-termination-sec-audit.md b/windows/keep-secure/audit-process-termination-sec-audit.md
index 8c49055030..ac362e72be 100644
--- a/windows/keep-secure/audit-process-termination-sec-audit.md
+++ b/windows/keep-secure/audit-process-termination-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Process Termination (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Process Termination which determines whether the operating system generates audit events when an attempt is made to end a process.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Process Termination, which determines whether the operating system generates audit events when an attempt is made to end a process.
 ms.assetid: 65d88e53-14aa-48a4-812b-557cebbf9e50
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-registry.md b/windows/keep-secure/audit-registry.md
index c161c19c51..f8c60d1b1f 100644
--- a/windows/keep-secure/audit-registry.md
+++ b/windows/keep-secure/audit-registry.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Registry (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Registry which determines whether the operating system generates audit events when users attempt to access registry objects.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Registry, which determines whether the operating system generates audit events when users attempt to access registry objects.
 ms.assetid: 02bcc23b-4823-46ac-b822-67beedf56b32
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-removable-storage.md b/windows/keep-secure/audit-removable-storage.md
index 3c4fb61bba..6046b1b29c 100644
--- a/windows/keep-secure/audit-removable-storage.md
+++ b/windows/keep-secure/audit-removable-storage.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Removable Storage (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Removable Storage which determines .
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Removable Storage, which determines .
 ms.assetid: 1746F7B3-8B41-4661-87D8-12F734AFFB26
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-rpc-events.md b/windows/keep-secure/audit-rpc-events.md
index e7a734cb22..de4ec1bad5 100644
--- a/windows/keep-secure/audit-rpc-events.md
+++ b/windows/keep-secure/audit-rpc-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit RPC Events (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit RPC Events which determines whether the operating system generates audit events when inbound remote procedure call (RPC) connections are made.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit RPC Events, which determines whether the operating system generates audit events when inbound remote procedure call (RPC) connections are made.
 ms.assetid: 868aec2d-93b4-4bc8-a150-941f88838ba6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-sam-sec-audit.md b/windows/keep-secure/audit-sam-sec-audit.md
index 87e27a3cf2..9afb708e33 100644
--- a/windows/keep-secure/audit-sam-sec-audit.md
+++ b/windows/keep-secure/audit-sam-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit SAM (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit SAM which enables you to audit events that are generated by attempts to access Security Account Manager (SAM) objects.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit SAM, which enables you to audit events that are generated by attempts to access Security Account Manager (SAM) objects.
 ms.assetid: 1d00f955-383d-4c95-bbd1-fab4a991a46e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-security-group-management.md b/windows/keep-secure/audit-security-group-management.md
index f66ef5bf4e..c4112315d8 100644
--- a/windows/keep-secure/audit-security-group-management.md
+++ b/windows/keep-secure/audit-security-group-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Security Group Management (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit Security Group Management which determines whether the operating system generates audit events when specific security group management tasks are performed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit Security Group Management, which determines whether the operating system generates audit events when specific security group management tasks are performed.
 ms.assetid: ac2ee101-557b-4c84-b9fa-4fb23331f1aa
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-security-state-change.md b/windows/keep-secure/audit-security-state-change.md
index be4c50f235..f20c08fa77 100644
--- a/windows/keep-secure/audit-security-state-change.md
+++ b/windows/keep-secure/audit-security-state-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Security State Change (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Security State Change which determines whether Windows generates audit events for changes in the security state of a system.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Security State Change, which determines whether Windows generates audit events for changes in the security state of a system.
 ms.assetid: decb3218-a67d-4efa-afc0-337c79a89a2d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-security-system-extension.md b/windows/keep-secure/audit-security-system-extension.md
index 43706a2c70..ace6274636 100644
--- a/windows/keep-secure/audit-security-system-extension.md
+++ b/windows/keep-secure/audit-security-system-extension.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Security System Extension (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Security System Extension which determines whether the operating system generates audit events related to security system extensions.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Security System Extension, which determines whether the operating system generates audit events related to security system extensions.
 ms.assetid: 9f3c6bde-42b2-4a0a-b353-ed3106ebc005
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-sensitive-privilege-use-sec-audit.md b/windows/keep-secure/audit-sensitive-privilege-use-sec-audit.md
index 74aac8210f..339007cdc8 100644
--- a/windows/keep-secure/audit-sensitive-privilege-use-sec-audit.md
+++ b/windows/keep-secure/audit-sensitive-privilege-use-sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Sensitive Privilege Use (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Sensitive Privilege Use which determines whether the operating system generates audit events when sensitive privileges (user rights) are used.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Sensitive Privilege Use, which determines whether the operating system generates audit events when sensitive privileges (user rights) are used.
 ms.assetid: 915abf50-42d2-45f6-9fd1-e7bd201b193d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md b/windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
index 2e02304d7a..dd3b82a5bd 100644
--- a/windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
+++ b/windows/keep-secure/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Shut down system immediately if unable to log security audits (Windows 10)
-description: Describes the best practices location values management practices and security considerations for the Audit Shut down system immediately if unable to log security audits security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management practices, and security considerations for the Audit Shut down system immediately if unable to log security audits security policy setting.
 ms.assetid: 2cd23cd9-0e44-4d0b-a1f1-39fc29303826
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management practices, and security considerations for the **Audit: Shut down system immediately if unable to log security audits** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/audit-special-logon.md b/windows/keep-secure/audit-special-logon.md
index 872a5aefa9..b95710f26b 100644
--- a/windows/keep-secure/audit-special-logon.md
+++ b/windows/keep-secure/audit-special-logon.md
@@ -1,7 +1,6 @@
 ---
 title: Audit Special Logon (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit Special Logon which determines whether the operating system generates audit events under special sign on (or log on) circumstances.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit Special Logon, which determines whether the operating system generates audit events under special sign on (or log on) circumstances.
 ms.assetid: e1501bac-1d09-4593-8ebb-f311231567d3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-system-integrity.md b/windows/keep-secure/audit-system-integrity.md
index 3b0b7a1e5b..b9e785f0b3 100644
--- a/windows/keep-secure/audit-system-integrity.md
+++ b/windows/keep-secure/audit-system-integrity.md
@@ -1,7 +1,6 @@
 ---
 title: Audit System Integrity (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Audit System Integrity which determines whether the operating system audits events that violate the integrity of the security subsystem.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit System Integrity, which determines whether the operating system audits events that violate the integrity of the security subsystem.
 ms.assetid: 942a9a7f-fa31-4067-88c7-f73978bf2034
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-user-account-management.md b/windows/keep-secure/audit-user-account-management.md
index d8fa52ee9b..406ceb5ef9 100644
--- a/windows/keep-secure/audit-user-account-management.md
+++ b/windows/keep-secure/audit-user-account-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit User Account Management (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit User Account Management which determines whether the operating system generates audit events when specific user account management tasks are performed.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit User Account Management, which determines whether the operating system generates audit events when specific user account management tasks are performed.
 ms.assetid: f7e72998-3858-4197-a443-19586ecc4bfb
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/audit-user-device-claims.md b/windows/keep-secure/audit-user-device-claims.md
index 90a6270c87..6d913998df 100644
--- a/windows/keep-secure/audit-user-device-claims.md
+++ b/windows/keep-secure/audit-user-device-claims.md
@@ -1,7 +1,6 @@
 ---
 title: Audit User/Device Claims (Windows 10)
-description: This topic for the IT professional describes the advanced security audit policy setting Audit User/Device Claims which enables you to audit security events that are generated by user and device claims.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the advanced security audit policy setting, Audit User/Device Claims, which enables you to audit security events that are generated by user and device claims.
 ms.assetid: D3D2BFAF-F2C0-462A-9377-673DB49D5486
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/back-up-files-and-directories.md b/windows/keep-secure/back-up-files-and-directories.md
index d0911f4ef4..fa7650f9c0 100644
--- a/windows/keep-secure/back-up-files-and-directories.md
+++ b/windows/keep-secure/back-up-files-and-directories.md
@@ -1,7 +1,6 @@
 ---
 title: Back up files and directories (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Back up files and directories security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Back up files and directories security policy setting.
 ms.assetid: 1cd6bdd5-1501-41f4-98b9-acf29ac173ae
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Back up files and directories** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/backup-thetpm-recovery-information-to-ad-ds.md b/windows/keep-secure/backup-thetpm-recovery-information-to-ad-ds.md
index dd6a4ff04f..83250faee4 100644
--- a/windows/keep-secure/backup-thetpm-recovery-information-to-ad-ds.md
+++ b/windows/keep-secure/backup-thetpm-recovery-information-to-ad-ds.md
@@ -1,7 +1,6 @@
 ---
 title: Backup the TPM recovery Information to AD DS (Windows 10)
 description: This topic for the IT professional describes how to back up a computer’s Trusted Platform Module (TPM) information to Active Directory Domain Services (AD DS) so that you can use AD DS to administer the TPM from a remote computer.
-MSHAttr: PreferredLib /library
 ms.assetid: 62bcec80-96a1-464e-8b3f-d177a7565ac5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-account-logon-events.md b/windows/keep-secure/basic-audit-account-logon-events.md
index 48b9671983..ebac5ddb27 100644
--- a/windows/keep-secure/basic-audit-account-logon-events.md
+++ b/windows/keep-secure/basic-audit-account-logon-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit account logon events (Windows 10)
 description: Determines whether to audit each instance of a user logging on to or logging off from another device in which this device is used to validate the account.
-MSHAttr: PreferredLib /library
 ms.assetid: 84B44181-E325-49A1-8398-AECC3CE0A516
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-account-management.md b/windows/keep-secure/basic-audit-account-management.md
index f856819936..54b8232935 100644
--- a/windows/keep-secure/basic-audit-account-management.md
+++ b/windows/keep-secure/basic-audit-account-management.md
@@ -1,7 +1,6 @@
 ---
 title: Audit account management (Windows 10)
 description: Determines whether to audit each event of account management on a device.
-MSHAttr: PreferredLib /library
 ms.assetid: 369197E1-7E0E-45A4-89EA-16D91EF01689
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-directory-service-access.md b/windows/keep-secure/basic-audit-directory-service-access.md
index 707f4c64ef..e5fe3073f9 100644
--- a/windows/keep-secure/basic-audit-directory-service-access.md
+++ b/windows/keep-secure/basic-audit-directory-service-access.md
@@ -1,7 +1,6 @@
 ---
 title: Audit directory service access (Windows 10)
 description: Determines whether to audit the event of a user accessing an Active Directory object that has its own system access control list (SACL) specified.
-MSHAttr: PreferredLib /library
 ms.assetid: 52F02EED-3CFE-4307-8D06-CF1E27693D09
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-logon-events.md b/windows/keep-secure/basic-audit-logon-events.md
index 3501a0592f..f9f85f3cae 100644
--- a/windows/keep-secure/basic-audit-logon-events.md
+++ b/windows/keep-secure/basic-audit-logon-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit logon events (Windows 10)
 description: Determines whether to audit each instance of a user logging on to or logging off from a device.
-MSHAttr: PreferredLib /library
 ms.assetid: 78B5AFCB-0BBD-4C38-9FE9-6B4571B94A35
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-object-access.md b/windows/keep-secure/basic-audit-object-access.md
index d2cd4c73d9..84b7afbcea 100644
--- a/windows/keep-secure/basic-audit-object-access.md
+++ b/windows/keep-secure/basic-audit-object-access.md
@@ -1,7 +1,6 @@
 ---
 title: Audit object access (Windows 10)
-description: Determines whether to audit the event of a user accessing an object for example a file folder registry key printer and so forth that has its own system access control list (SACL) specified.
-MSHAttr: PreferredLib /library
+description: Determines whether to audit the event of a user accessing an object--for example, a file, folder, registry key, printer, and so forth--that has its own system access control list (SACL) specified.
 ms.assetid: D15B6D67-7886-44C2-9972-3F192D5407EA
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-policy-change.md b/windows/keep-secure/basic-audit-policy-change.md
index 60cc9a4edf..48eb4dc41b 100644
--- a/windows/keep-secure/basic-audit-policy-change.md
+++ b/windows/keep-secure/basic-audit-policy-change.md
@@ -1,7 +1,6 @@
 ---
 title: Audit policy change (Windows 10)
-description: Determines whether to audit every incident of a change to user rights assignment policies audit policies or trust policies.
-MSHAttr: PreferredLib /library
+description: Determines whether to audit every incident of a change to user rights assignment policies, audit policies, or trust policies.
 ms.assetid: 1025A648-6B22-4C85-9F47-FE0897F1FA31
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-privilege-use.md b/windows/keep-secure/basic-audit-privilege-use.md
index b0dade1163..bf1b98b716 100644
--- a/windows/keep-secure/basic-audit-privilege-use.md
+++ b/windows/keep-secure/basic-audit-privilege-use.md
@@ -1,7 +1,6 @@
 ---
 title: Audit privilege use (Windows 10)
 description: Determines whether to audit each instance of a user exercising a user right.
-MSHAttr: PreferredLib /library
 ms.assetid: C5C6DAAF-8B58-4DFB-B1CE-F0675AE0E9F8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-process-tracking.md b/windows/keep-secure/basic-audit-process-tracking.md
index 0cc1c9e9c1..d0efa7d0b8 100644
--- a/windows/keep-secure/basic-audit-process-tracking.md
+++ b/windows/keep-secure/basic-audit-process-tracking.md
@@ -1,7 +1,6 @@
 ---
 title: Audit process tracking (Windows 10)
-description: Determines whether to audit detailed tracking information for events such as program activation process exit handle duplication and indirect object access.
-MSHAttr: PreferredLib /library
+description: Determines whether to audit detailed tracking information for events such as program activation, process exit, handle duplication, and indirect object access.
 ms.assetid: 91AC5C1E-F4DA-4B16-BEE2-C92D66E4CEEA
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-audit-system-events.md b/windows/keep-secure/basic-audit-system-events.md
index 86ddde2f56..34f4206e90 100644
--- a/windows/keep-secure/basic-audit-system-events.md
+++ b/windows/keep-secure/basic-audit-system-events.md
@@ -1,7 +1,6 @@
 ---
 title: Audit system events (Windows 10)
 description: Determines whether to audit when a user restarts or shuts down the computer or when an event occurs that affects either the system security or the security log.
-MSHAttr: PreferredLib /library
 ms.assetid: BF27588C-2AA7-4365-A4BF-3BB377916447
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-security-audit-policies.md b/windows/keep-secure/basic-security-audit-policies.md
index ebcb9a43ab..8aaba83b70 100644
--- a/windows/keep-secure/basic-security-audit-policies.md
+++ b/windows/keep-secure/basic-security-audit-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Basic security audit policies (Windows 10)
-description: Before you implement auditing you must decide on an auditing policy.
-MSHAttr: PreferredLib /library
+description: Before you implement auditing, you must decide on an auditing policy.
 ms.assetid: 3B678568-7AD7-4734-9BB4-53CF5E04E1D3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/basic-security-audit-policy-settings.md b/windows/keep-secure/basic-security-audit-policy-settings.md
index 435b69c24a..f59bbe3000 100644
--- a/windows/keep-secure/basic-security-audit-policy-settings.md
+++ b/windows/keep-secure/basic-security-audit-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Basic security audit policy settings (Windows 10)
 description: Basic security audit policy settings are found under Computer Configuration\\Windows Settings\\Security Settings\\Local Policies\\Audit Policy.
-MSHAttr: PreferredLib /library
 ms.assetid: 31C2C453-2CFC-4D9E-BC88-8CE1C1A8F900
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bcd-settings-and-bitlocker.md b/windows/keep-secure/bcd-settings-and-bitlocker.md
index 87446b9ee8..c245fc0a1b 100644
--- a/windows/keep-secure/bcd-settings-and-bitlocker.md
+++ b/windows/keep-secure/bcd-settings-and-bitlocker.md
@@ -1,7 +1,6 @@
 ---
 title: BCD settings and BitLocker (Windows 10)
 description: This topic for IT professionals describes the BCD settings that are used by BitLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: c4ab7ac9-16dc-4c7e-b061-c0b0deb2c4fa
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-basic-deployment.md b/windows/keep-secure/bitlocker-basic-deployment.md
index 299c337779..66830c7a84 100644
--- a/windows/keep-secure/bitlocker-basic-deployment.md
+++ b/windows/keep-secure/bitlocker-basic-deployment.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker basic deployment (Windows 10)
 description: This topic for the IT professional explains how BitLocker features can be used to protect your data through drive encryption.
-MSHAttr: PreferredLib /library
 ms.assetid: 97c646cb-9e53-4236-9678-354af41151c4
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-countermeasures.md b/windows/keep-secure/bitlocker-countermeasures.md
index 238bb34b04..29a453dfe6 100644
--- a/windows/keep-secure/bitlocker-countermeasures.md
+++ b/windows/keep-secure/bitlocker-countermeasures.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker Countermeasures (Windows 10)
-description: Windows uses technologies including TPM Secure Boot Trusted Boot and Early Launch Antimalware (ELAM) to protect against attacks on the BitLocker encryption key.
-MSHAttr: PreferredLib /library
+description: Windows uses technologies including TPM, Secure Boot, Trusted Boot, and Early Launch Antimalware (ELAM) to protect against attacks on the BitLocker encryption key.
 ms.assetid: ebdb0637-2597-4da1-bb18-8127964686ea
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-frequently-asked-questions--faq-.md b/windows/keep-secure/bitlocker-frequently-asked-questions--faq-.md
index 4ebd0eee2f..ce094d3d47 100644
--- a/windows/keep-secure/bitlocker-frequently-asked-questions--faq-.md
+++ b/windows/keep-secure/bitlocker-frequently-asked-questions--faq-.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker frequently asked questions (FAQ) (Windows 10)
-description: This topic for the IT professional answers frequently asked questions concerning the requirements to use upgrade deploy and administer and key management policies for BitLocker.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional answers frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.
 ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-group-policy-settings.md b/windows/keep-secure/bitlocker-group-policy-settings.md
index 2c4d4066c3..f7957e0739 100644
--- a/windows/keep-secure/bitlocker-group-policy-settings.md
+++ b/windows/keep-secure/bitlocker-group-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker Group Policy settings (Windows 10)
-description: This topic for IT professionals describes the function location and effect of each Group Policy setting that is used to manage BitLocker Drive Encryption.
-MSHAttr: PreferredLib /library
+description: This topic for IT professionals describes the function, location, and effect of each Group Policy setting that is used to manage BitLocker Drive Encryption.
 ms.assetid: 4904e336-29fe-4cef-bb6c-3950541864af
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-how-to-deploy-on-windows-server-2012.md b/windows/keep-secure/bitlocker-how-to-deploy-on-windows-server-2012.md
index c6e8394c2b..2c438aba69 100644
--- a/windows/keep-secure/bitlocker-how-to-deploy-on-windows-server-2012.md
+++ b/windows/keep-secure/bitlocker-how-to-deploy-on-windows-server-2012.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker How to deploy on Windows Server 2012 and later (Windows 10)
 description: This topic for the IT professional explains how to deploy BitLocker and Windows Server 2012 and later.
-MSHAttr: PreferredLib /library
 ms.assetid: 91c18e9e-6ab4-4607-8c75-d983bbe2542f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-how-to-enable-network-unlock.md b/windows/keep-secure/bitlocker-how-to-enable-network-unlock.md
index 308b77439a..b2613c0549 100644
--- a/windows/keep-secure/bitlocker-how-to-enable-network-unlock.md
+++ b/windows/keep-secure/bitlocker-how-to-enable-network-unlock.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker How to enable Network Unlock (Windows 10)
 description: This topic for the IT professional describes how BitLocker Network Unlock works and how to configure it.
-MSHAttr: PreferredLib /library
 ms.assetid: be45bc28-47db-4931-bfec-3c348151d2e9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-overview-roletech-overview.md b/windows/keep-secure/bitlocker-overview-roletech-overview.md
index f41ce02f82..7f2991b171 100644
--- a/windows/keep-secure/bitlocker-overview-roletech-overview.md
+++ b/windows/keep-secure/bitlocker-overview-roletech-overview.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker (Windows 10)
-description: This topic provides a high level overview of BitLocker including a list of system requirements practical applications and deprecated features.
-MSHAttr: PreferredLib /library
+description: This topic provides a high-level overview of BitLocker, including a list of system requirements, practical applications, and deprecated features.
 ms.assetid: 40526fcc-3e0d-4d75-90e0-c7d0615f33b2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-recovery-guide-plan.md b/windows/keep-secure/bitlocker-recovery-guide-plan.md
index 44c3d0d2e0..cbea802779 100644
--- a/windows/keep-secure/bitlocker-recovery-guide-plan.md
+++ b/windows/keep-secure/bitlocker-recovery-guide-plan.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker recovery guide (Windows 10)
 description: This topic for IT professionals describes how to recover BitLocker keys from AD DS.
-MSHAttr: PreferredLib /library
 ms.assetid: d0f722e9-1773-40bf-8456-63ee7a95ea14
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md b/windows/keep-secure/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
index 5ade63e498..2ccb3203fd 100644
--- a/windows/keep-secure/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
+++ b/windows/keep-secure/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker Use BitLocker Drive Encryption Tools to manage BitLocker (Windows 10)
 description: This topic for the IT professional describes how to use tools to manage BitLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: e869db9c-e906-437b-8c70-741dd61b5ea6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/bitlocker-use-bitlocker-recovery-password-viewer.md b/windows/keep-secure/bitlocker-use-bitlocker-recovery-password-viewer.md
index 2d3f3dce21..324a8f3227 100644
--- a/windows/keep-secure/bitlocker-use-bitlocker-recovery-password-viewer.md
+++ b/windows/keep-secure/bitlocker-use-bitlocker-recovery-password-viewer.md
@@ -1,7 +1,6 @@
 ---
 title: BitLocker Use BitLocker Recovery Password Viewer (Windows 10)
 description: This topic for the IT professional describes how to use the BitLocker Recovery Password Viewer.
-MSHAttr: PreferredLib /library
 ms.assetid: 04c93ac5-5dac-415e-b636-de81435753a2
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/block-untrusted-fonts-in-an-enterprise.md b/windows/keep-secure/block-untrusted-fonts-in-an-enterprise.md
index 0a5817ad60..4f147b8dcf 100644
--- a/windows/keep-secure/block-untrusted-fonts-in-an-enterprise.md
+++ b/windows/keep-secure/block-untrusted-fonts-in-an-enterprise.md
@@ -1,7 +1,6 @@
 ---
 title: Block untrusted fonts in an enterprise (Windows 10)
-description: 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.
-MSHAttr: PreferredLib /library
+description: 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.
 ms.assetid: A3354C8E-4208-4BE6-BC19-56A572C361B4
 keywords: ["font blocking", "untrusted font blocking", "block fonts", "untrusted fonts"]
 ms.prod: W10
diff --git a/windows/keep-secure/bypass-traverse-checking.md b/windows/keep-secure/bypass-traverse-checking.md
index a9dccc45eb..b0d84bfa72 100644
--- a/windows/keep-secure/bypass-traverse-checking.md
+++ b/windows/keep-secure/bypass-traverse-checking.md
@@ -1,7 +1,6 @@
 ---
 title: Bypass traverse checking (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Bypass traverse checking security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Bypass traverse checking security policy setting.
 ms.assetid: 1c828655-68d3-4140-aa0f-caa903a7087e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Bypass traverse checking** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md
index 634b33877d..d0bbf40083 100644
--- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md
+++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md
@@ -1,7 +1,6 @@
 ---
 title: Change history for Keep Windows 10 secure (Windows 10)
 description: This topic lists new and updated topics in the Keep Windows 10 secure documentation for Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: E50EC5E6-71AA-4FF1-8356-574CFDB8079B
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -14,6 +13,13 @@ author: brianlic-msft
 
 This topic lists new and updated topics in the [Keep Windows 10 secure](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
 
+| New or changed topic                                                             | Description                                                                                                                                                                           |
+|----------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Protect derived domain credentials with Credential Guard](credential-guard.md) | Clarified Credential Guard protections                                                                                                                                                |
+| [Requirements to use AppLocker](requirements-to-use-applocker.md)               | Added that MDM can be used to manage any edition of Windows 10. Windows 10 Enterprise or Windows Server 2016 Technical Preview is required to manage AppLocker by using Group Policy. |
+
+ 
+
 ## February 2016
 
 
diff --git a/windows/keep-secure/change-the-system-time.md b/windows/keep-secure/change-the-system-time.md
index f56ff7446d..e654e9d952 100644
--- a/windows/keep-secure/change-the-system-time.md
+++ b/windows/keep-secure/change-the-system-time.md
@@ -1,7 +1,6 @@
 ---
 title: Change the system time (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Change the system time security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Change the system time security policy setting.
 ms.assetid: f2f6637d-acbc-4352-8ca3-ec563f918e65
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Change the system time** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/change-the-time-zone.md b/windows/keep-secure/change-the-time-zone.md
index a45e63d6de..63a5424dc7 100644
--- a/windows/keep-secure/change-the-time-zone.md
+++ b/windows/keep-secure/change-the-time-zone.md
@@ -1,7 +1,6 @@
 ---
 title: Change the time zone (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Change the time zone security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Change the time zone security policy setting.
 ms.assetid: 3b1afae4-68bb-472f-a43e-49e300d73e50
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Change the time zone** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/change-the-tpm-owner-password.md b/windows/keep-secure/change-the-tpm-owner-password.md
index f64aead7c6..7fbc740264 100644
--- a/windows/keep-secure/change-the-tpm-owner-password.md
+++ b/windows/keep-secure/change-the-tpm-owner-password.md
@@ -1,7 +1,6 @@
 ---
 title: Change the TPM owner password (Windows 10)
 description: This topic for the IT professional describes how to change the password or PIN for the owner of the Trusted Platform Module (TPM) that is installed on your system.
-MSHAttr: PreferredLib /library
 ms.assetid: e43dcff3-acb4-4a92-8816-d6b64b7f2f45
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md b/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md
index a4dfb3e2a5..efc0a930ad 100644
--- a/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md
+++ b/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md
@@ -1,7 +1,6 @@
 ---
 title: Choose the right BitLocker countermeasure (Windows 10)
-description: This section outlines the best countermeasures you can use to protect your organization from bootkits and rootkits brute force sign in Direct Memory Access (DMA) attacks Hyberfil.sys attacks and memory remanence attacks.
-MSHAttr: PreferredLib /library
+description: This section outlines the best countermeasures you can use to protect your organization from bootkits and rootkits, brute force sign-in, Direct Memory Access (DMA) attacks, Hyberfil.sys attacks, and memory remanence attacks.
 ms.assetid: b0b09508-7885-4030-8c61-d91458afdb14
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-an-applocker-policy-for-audit-only.md b/windows/keep-secure/configure-an-applocker-policy-for-audit-only.md
index 287a812b24..f554bbf9cb 100644
--- a/windows/keep-secure/configure-an-applocker-policy-for-audit-only.md
+++ b/windows/keep-secure/configure-an-applocker-policy-for-audit-only.md
@@ -1,7 +1,6 @@
 ---
 title: Configure an AppLocker policy for audit only (Windows 10)
 description: This topic for IT professionals describes how to set AppLocker policies to Audit only within your IT environment by using AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 10bc87d5-cc7f-4500-b7b3-9006e50afa50
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-an-applocker-policy-for-enforce-rules.md b/windows/keep-secure/configure-an-applocker-policy-for-enforce-rules.md
index cabecfe107..acea4f15df 100644
--- a/windows/keep-secure/configure-an-applocker-policy-for-enforce-rules.md
+++ b/windows/keep-secure/configure-an-applocker-policy-for-enforce-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Configure an AppLocker policy for enforce rules (Windows 10)
 description: This topic for IT professionals describes the steps to enable the AppLocker policy enforcement setting.
-MSHAttr: PreferredLib /library
 ms.assetid: 5dbbb290-a5ae-4f88-82b3-21e95972e66c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-exceptions-for-an-applocker-rule.md b/windows/keep-secure/configure-exceptions-for-an-applocker-rule.md
index 1f18f1d15c..126647dac7 100644
--- a/windows/keep-secure/configure-exceptions-for-an-applocker-rule.md
+++ b/windows/keep-secure/configure-exceptions-for-an-applocker-rule.md
@@ -1,7 +1,6 @@
 ---
 title: Add exceptions for an AppLocker rule (Windows 10)
 description: This topic for IT professionals describes the steps to specify which apps can or cannot run as exceptions to an AppLocker rule.
-MSHAttr: PreferredLib /library
 ms.assetid: d15c9d84-c14b-488d-9f48-bf31ff7ff0c5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-s-mime.md b/windows/keep-secure/configure-s-mime.md
index a6b359b519..a6b93324d3 100644
--- a/windows/keep-secure/configure-s-mime.md
+++ b/windows/keep-secure/configure-s-mime.md
@@ -1,7 +1,6 @@
 ---
 title: Configure S/MIME for Windows 10 and Windows 10 Mobile (Windows 10)
-description: In Windows 10 S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID) also known as a certificate can read them.
-MSHAttr: PreferredLib /library
+description: In Windows 10, S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID), also known as a certificate, can read them.
 ms.assetid: 7F9C2A99-42EB-4BCC-BB53-41C04FBBBF05
 keywords: ["encrypt", "digital signature"]
 ms.prod: W10
@@ -18,16 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [About message encryption](#about-message-encryption)
--   [About digital signatures](#about-digital-signatures)
--   [Prerequisites](#prerequisites)
--   [Choose S/MIME settings](#choose-s-mime-settings)
--   [Encrypt or sign individual messages](#encrypt-or-sign-individual-messages)
--   [Read signed or encrypted messages](#read-signed-or-encrypted-messages)
--   [Install certificates from a received message](#install-certificates-from-a-received-message)
-
 S/MIME stands for Secure/Multipurpose Internet Mail Extensions, and provides an added layer of security for email sent to and from an Exchange ActiveSync (EAS) account. In Windows 10, S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID), also known as a certificate, can read them. Users can digitally sign a message, which provides the recipients with a way to verify the identity of the sender and that the message hasn't been tampered with.
 
 ## About message encryption
diff --git a/windows/keep-secure/configure-the-application-identity-service.md b/windows/keep-secure/configure-the-application-identity-service.md
index 3dcb5ea6f8..d09240e41c 100644
--- a/windows/keep-secure/configure-the-application-identity-service.md
+++ b/windows/keep-secure/configure-the-application-identity-service.md
@@ -1,7 +1,6 @@
 ---
 title: Configure the Application Identity service (Windows 10)
 description: This topic for IT professionals shows how to configure the Application Identity service to start automatically or manually.
-MSHAttr: PreferredLib /library
 ms.assetid: dc469599-37fd-448b-b23e-5b8e4f17e561
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-the-applocker-reference-computer-ops.md b/windows/keep-secure/configure-the-applocker-reference-computer-ops.md
index 44f1992841..3d1f849430 100644
--- a/windows/keep-secure/configure-the-applocker-reference-computer-ops.md
+++ b/windows/keep-secure/configure-the-applocker-reference-computer-ops.md
@@ -1,7 +1,6 @@
 ---
 title: Configure the AppLocker reference device (Windows 10)
 description: This topic for the IT professional describes the steps to create an AppLocker policy platform structure on a reference computer.
-MSHAttr: PreferredLib /library
 ms.assetid: 034bd367-146d-4956-873c-e1e09e6fefee
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/configure-windows-defender-for-windows-10.md b/windows/keep-secure/configure-windows-defender-for-windows-10.md
index 937087174e..f8b46f5321 100644
--- a/windows/keep-secure/configure-windows-defender-for-windows-10.md
+++ b/windows/keep-secure/configure-windows-defender-for-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Configure Windows Defender in Windows 10 (Windows 10)
-description: IT professionals can configure definition updates and cloud based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS).
-MSHAttr: PreferredLib /library
+description: IT professionals can configure definition updates and cloud-based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS).
 ms.assetid: 22649663-AC7A-40D8-B1F7-5CAD9E49653D
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -16,16 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Configure definition updates](#configure-definition-updates)
--   [Definition update logic](#definition-update-logic)
--   [Update Windows Defender definitions through Active Directory and WSUS](#update-windows-defender-definitions-through-active-directory-and-wsus)
--   [Manage cloud-based protection](#manage-cloud-based-protection)
--   [Opt-in to Microsoft Update](#opt-in-to-microsoft-update)
--   [Schedule updates for Microsoft Update](#schedule-updates-for-microsoft-update)
--   [Related topics](#related-topics)
-
 IT professionals can configure definition updates and cloud-based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS).
 
 ## Configure definition updates
diff --git a/windows/keep-secure/create-a-basic-audit-policy-settings-for-an-event-category.md b/windows/keep-secure/create-a-basic-audit-policy-settings-for-an-event-category.md
index 11538d35e0..bf422552a0 100644
--- a/windows/keep-secure/create-a-basic-audit-policy-settings-for-an-event-category.md
+++ b/windows/keep-secure/create-a-basic-audit-policy-settings-for-an-event-category.md
@@ -1,7 +1,6 @@
 ---
 title: Create a basic audit policy for an event category (Windows 10)
-description: By defining auditing settings for specific event categories you can create an auditing policy that suits the security needs of your organization.
-MSHAttr: PreferredLib /library
+description: By defining auditing settings for specific event categories, you can create an auditing policy that suits the security needs of your organization.
 ms.assetid: C9F52751-B40D-482E-BE9D-2C61098249D3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-a-pagefile.md b/windows/keep-secure/create-a-pagefile.md
index 3943d3229e..ffa275db74 100644
--- a/windows/keep-secure/create-a-pagefile.md
+++ b/windows/keep-secure/create-a-pagefile.md
@@ -1,7 +1,6 @@
 ---
 title: Create a pagefile (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Create a pagefile security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Create a pagefile security policy setting.
 ms.assetid: dc087897-459d-414b-abe0-cd86c8dccdea
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Create a pagefile** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/create-a-rule-for-packaged-apps.md b/windows/keep-secure/create-a-rule-for-packaged-apps.md
index ab4276f252..f16c4fcee9 100644
--- a/windows/keep-secure/create-a-rule-for-packaged-apps.md
+++ b/windows/keep-secure/create-a-rule-for-packaged-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Create a rule for packaged apps (Windows 10)
 description: This topic for IT professionals shows how to create an AppLocker rule for packaged apps with a publisher condition.
-MSHAttr: PreferredLib /library
 ms.assetid: e4ffd400-7860-47b3-9118-0e6853c3dfa0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-a-rule-that-uses-a-file-hash-condition.md b/windows/keep-secure/create-a-rule-that-uses-a-file-hash-condition.md
index 5b38c5514d..19f8350862 100644
--- a/windows/keep-secure/create-a-rule-that-uses-a-file-hash-condition.md
+++ b/windows/keep-secure/create-a-rule-that-uses-a-file-hash-condition.md
@@ -1,7 +1,6 @@
 ---
 title: Create a rule that uses a file hash condition (Windows 10)
 description: This topic for IT professionals shows how to create an AppLocker rule with a file hash condition.
-MSHAttr: PreferredLib /library
 ms.assetid: eb3b3524-1b3b-4979-ba5a-0a0b1280c5c7
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-a-rule-that-uses-a-path-condition.md b/windows/keep-secure/create-a-rule-that-uses-a-path-condition.md
index 8be917a723..59f864fa6e 100644
--- a/windows/keep-secure/create-a-rule-that-uses-a-path-condition.md
+++ b/windows/keep-secure/create-a-rule-that-uses-a-path-condition.md
@@ -1,7 +1,6 @@
 ---
 title: Create a rule that uses a path condition (Windows 10)
 description: This topic for IT professionals shows how to create an AppLocker rule with a path condition.
-MSHAttr: PreferredLib /library
 ms.assetid: 9b2093f5-5976-45fa-90c3-da1e0e845d95
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-a-rule-that-uses-a-publisher-condition.md b/windows/keep-secure/create-a-rule-that-uses-a-publisher-condition.md
index 7ecdb3269d..cbbec57db2 100644
--- a/windows/keep-secure/create-a-rule-that-uses-a-publisher-condition.md
+++ b/windows/keep-secure/create-a-rule-that-uses-a-publisher-condition.md
@@ -1,7 +1,6 @@
 ---
 title: Create a rule that uses a publisher condition (Windows 10)
 description: This topic for IT professionals shows how to create an AppLocker rule with a publisher condition.
-MSHAttr: PreferredLib /library
 ms.assetid: 345ad45f-2bc1-4c4c-946f-17804e29f55b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-a-token-object.md b/windows/keep-secure/create-a-token-object.md
index 48bb45bab1..f5be6bd569 100644
--- a/windows/keep-secure/create-a-token-object.md
+++ b/windows/keep-secure/create-a-token-object.md
@@ -1,7 +1,6 @@
 ---
 title: Create a token object (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Create a token object security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Create a token object security policy setting.
 ms.assetid: bfbf52fc-6ba4-442a-9df7-bd277e55729c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Create a token object** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/create-applocker-default-rules.md b/windows/keep-secure/create-applocker-default-rules.md
index 954f839340..d701502116 100644
--- a/windows/keep-secure/create-applocker-default-rules.md
+++ b/windows/keep-secure/create-applocker-default-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Create AppLocker default rules (Windows 10)
 description: This topic for IT professionals describes the steps to create a standard set of AppLocker rules that will allow Windows system files to run.
-MSHAttr: PreferredLib /library
 ms.assetid: 21e9dc68-a6f4-4ebe-ac28-4c66a7ab6e18
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-global-objects.md b/windows/keep-secure/create-global-objects.md
index dbe4014a63..dd10fb6763 100644
--- a/windows/keep-secure/create-global-objects.md
+++ b/windows/keep-secure/create-global-objects.md
@@ -1,7 +1,6 @@
 ---
 title: Create global objects (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Create global objects security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Create global objects security policy setting.
 ms.assetid: 9cb6247b-44fc-4815-86f2-cb59b6f0221e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Create global objects** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/create-list-of-applications-deployed-to-each-business-group.md b/windows/keep-secure/create-list-of-applications-deployed-to-each-business-group.md
index cafdf81775..64fb148309 100644
--- a/windows/keep-secure/create-list-of-applications-deployed-to-each-business-group.md
+++ b/windows/keep-secure/create-list-of-applications-deployed-to-each-business-group.md
@@ -1,7 +1,6 @@
 ---
 title: Create a list of apps deployed to each business group (Windows 10)
 description: This topic describes the process of gathering app usage requirements from each business group in order to implement application control policies by using AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: d713aa07-d732-4bdc-8656-ba616d779321
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-permanent-shared-objects.md b/windows/keep-secure/create-permanent-shared-objects.md
index 4160ff4550..79fc9f07f7 100644
--- a/windows/keep-secure/create-permanent-shared-objects.md
+++ b/windows/keep-secure/create-permanent-shared-objects.md
@@ -1,7 +1,6 @@
 ---
 title: Create permanent shared objects (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Create permanent shared objects security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Create permanent shared objects security policy setting.
 ms.assetid: 6a58438d-65ca-4c4a-a584-450eed976649
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Create permanent shared objects** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/create-symbolic-links.md b/windows/keep-secure/create-symbolic-links.md
index 79983e2678..38de1ae084 100644
--- a/windows/keep-secure/create-symbolic-links.md
+++ b/windows/keep-secure/create-symbolic-links.md
@@ -1,7 +1,6 @@
 ---
 title: Create symbolic links (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Create symbolic links security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Create symbolic links security policy setting.
 ms.assetid: 882922b9-0ff8-4ee9-8afc-4475515ee3fd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Create symbolic links** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/create-your-applocker-planning-document.md b/windows/keep-secure/create-your-applocker-planning-document.md
index daa3e9801f..2d5ae406e6 100644
--- a/windows/keep-secure/create-your-applocker-planning-document.md
+++ b/windows/keep-secure/create-your-applocker-planning-document.md
@@ -1,7 +1,6 @@
 ---
 title: Create your AppLocker planning document (Windows 10)
 description: This planning topic for the IT professional summarizes the information you need to research and include in your AppLocker planning document.
-MSHAttr: PreferredLib /library
 ms.assetid: 41e49644-baf4-4514-b089-88adae2d624e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-your-applocker-policies.md b/windows/keep-secure/create-your-applocker-policies.md
index fada037a6d..d08dbfd31a 100644
--- a/windows/keep-secure/create-your-applocker-policies.md
+++ b/windows/keep-secure/create-your-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Create Your AppLocker policies (Windows 10)
 description: This overview topic for the IT professional describes the steps to create an AppLocker policy and prepare it for deployment.
-MSHAttr: PreferredLib /library
 ms.assetid: d339dee2-4da2-4d4a-b46e-f1dfb7cb4bf0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/create-your-applocker-rules.md b/windows/keep-secure/create-your-applocker-rules.md
index 4e05a5dd69..ef65a70017 100644
--- a/windows/keep-secure/create-your-applocker-rules.md
+++ b/windows/keep-secure/create-your-applocker-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Create Your AppLocker rules (Windows 10)
 description: This topic for the IT professional describes what you need to know about AppLocker rules and the methods that you can to create rules.
-MSHAttr: PreferredLib /library
 ms.assetid: b684a3a5-929c-4f70-8742-04088022f232
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/creating-a-device-guard-policy-for-signed-apps.md b/windows/keep-secure/creating-a-device-guard-policy-for-signed-apps.md
index d39ae6be01..9028d0b0c4 100644
--- a/windows/keep-secure/creating-a-device-guard-policy-for-signed-apps.md
+++ b/windows/keep-secure/creating-a-device-guard-policy-for-signed-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Create a Device Guard code integrity policy based on a reference device (Windows 10)
-description: To implement Device Guard app protection you will need to create a code integrity policy. Code integrity policies determine what apps are considered trustworthy and are allowed to run on a protected device.
-MSHAttr: PreferredLib /library
+description: To implement Device Guard app protection, you will need to create a code integrity policy. Code integrity policies determine what apps are considered trustworthy and are allowed to run on a protected device.
 ms.assetid: 6C94B14E-E2CE-4F6C-8939-4B375406E825
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/credential-guard.md b/windows/keep-secure/credential-guard.md
index 812cbae560..23fb6bef14 100644
--- a/windows/keep-secure/credential-guard.md
+++ b/windows/keep-secure/credential-guard.md
@@ -1,7 +1,6 @@
 ---
 title: Protect derived domain credentials with Credential Guard (Windows 10)
-description: Introduced in Windows 10 Enterprise Credential Guard uses virtualization based security to isolate secrets so that only privileged system software can access them.
-MSHAttr: PreferredLib /library
+description: Introduced in Windows 10 Enterprise, Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them.
 ms.assetid: 4F1FE390-A166-4A24-8530-EA3369FEB4B1
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language--sddl--syntax.md b/windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
index 154228dabf..33a9de5798 100644
--- a/windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
+++ b/windows/keep-secure/dcom-machine-access-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
@@ -1,7 +1,6 @@
 ---
 title: DCOM Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax (Windows 10)
-description: Describes the best practices location values and security considerations for the DCOM Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the DCOM Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax policy setting.
 ms.assetid: 0fe3521a-5252-44df-8a47-8d92cf936e7c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **DCOM: Machine Access Restrictions in Security Descriptor Definition Language (SDDL) syntax** policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language--sddl--syntax.md b/windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
index f6d8eedba2..091917ee51 100644
--- a/windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
+++ b/windows/keep-secure/dcom-machine-launch-restrictions-in-security-descriptor-definition-language--sddl--syntax.md
@@ -1,7 +1,6 @@
 ---
 title: DCOM Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax (Windows 10)
-description: Describes the best practices location values and security considerations for the DCOM Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the DCOM Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax security policy setting.
 ms.assetid: 4b95d45f-dd62-4c34-ba32-43954528dabe
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **DCOM: Machine Launch Restrictions in Security Descriptor Definition Language (SDDL) syntax** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/debug-programs.md b/windows/keep-secure/debug-programs.md
index 792151b02e..2950e96f89 100644
--- a/windows/keep-secure/debug-programs.md
+++ b/windows/keep-secure/debug-programs.md
@@ -1,7 +1,6 @@
 ---
 title: Debug programs (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Debug programs security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Debug programs security policy setting.
 ms.assetid: 594d9f2c-8ffc-444b-9522-75615ec87786
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Debug programs** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/delete-an-applocker-rule.md b/windows/keep-secure/delete-an-applocker-rule.md
index 26d91f8f62..bed27aa9de 100644
--- a/windows/keep-secure/delete-an-applocker-rule.md
+++ b/windows/keep-secure/delete-an-applocker-rule.md
@@ -1,7 +1,6 @@
 ---
 title: Delete an AppLocker rule (Windows 10)
 description: This topic for IT professionals describes the steps to delete an AppLocker rule.
-MSHAttr: PreferredLib /library
 ms.assetid: 382b4be3-0df9-4308-89b2-dcf9df351eb5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/deny-access-to-this-computer-from-the-network.md b/windows/keep-secure/deny-access-to-this-computer-from-the-network.md
index aa56945d1c..e4e6d176a7 100644
--- a/windows/keep-secure/deny-access-to-this-computer-from-the-network.md
+++ b/windows/keep-secure/deny-access-to-this-computer-from-the-network.md
@@ -1,7 +1,6 @@
 ---
 title: Deny access to this computer from the network (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Deny access to this computer from the network security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Deny access to this computer from the network security policy setting.
 ms.assetid: 935e9f89-951b-4163-b186-fc325682bb0b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Deny access to this computer from the network** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/deny-log-on-as-a-batch-job.md b/windows/keep-secure/deny-log-on-as-a-batch-job.md
index ce7156a1a3..c7a4c65273 100644
--- a/windows/keep-secure/deny-log-on-as-a-batch-job.md
+++ b/windows/keep-secure/deny-log-on-as-a-batch-job.md
@@ -1,7 +1,6 @@
 ---
 title: Deny log on as a batch job (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Deny log on as a batch job security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Deny log on as a batch job security policy setting.
 ms.assetid: 0ac36ebd-5e28-4b6a-9b4e-8924c6ecf44b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Deny log on as a batch job** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/deny-log-on-as-a-service.md b/windows/keep-secure/deny-log-on-as-a-service.md
index e1d54deae9..005a760cfe 100644
--- a/windows/keep-secure/deny-log-on-as-a-service.md
+++ b/windows/keep-secure/deny-log-on-as-a-service.md
@@ -1,7 +1,6 @@
 ---
 title: Deny log on as a service (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Deny log on as a service security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Deny log on as a service security policy setting.
 ms.assetid: f1114964-df86-4278-9b11-e35c66949794
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Deny log on as a service** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/deny-log-on-locally.md b/windows/keep-secure/deny-log-on-locally.md
index d03d8afdfc..82391e79b2 100644
--- a/windows/keep-secure/deny-log-on-locally.md
+++ b/windows/keep-secure/deny-log-on-locally.md
@@ -1,7 +1,6 @@
 ---
 title: Deny log on locally (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Deny log on locally security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Deny log on locally security policy setting.
 ms.assetid: 00150e88-ec9c-43e1-a70d-33bfe10434db
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Deny log on locally** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/deny-log-on-through-remote-desktop-services.md b/windows/keep-secure/deny-log-on-through-remote-desktop-services.md
index 337d9db675..952c471dfd 100644
--- a/windows/keep-secure/deny-log-on-through-remote-desktop-services.md
+++ b/windows/keep-secure/deny-log-on-through-remote-desktop-services.md
@@ -1,7 +1,6 @@
 ---
 title: Deny log on through Remote Desktop Services (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Deny log on through Remote Desktop Services security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Deny log on through Remote Desktop Services security policy setting.
 ms.assetid: 84bbb807-287c-4acc-a094-cf0ffdcbca67
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Deny log on through Remote Desktop Services** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/deploy-applocker-policies-by-using-the-enforce-rules-setting.md b/windows/keep-secure/deploy-applocker-policies-by-using-the-enforce-rules-setting.md
index 09c4d45ee5..dee2747b62 100644
--- a/windows/keep-secure/deploy-applocker-policies-by-using-the-enforce-rules-setting.md
+++ b/windows/keep-secure/deploy-applocker-policies-by-using-the-enforce-rules-setting.md
@@ -1,7 +1,6 @@
 ---
 title: Deploy AppLocker policies by using the enforce rules setting (Windows 10)
 description: This topic for IT professionals describes the steps to deploy AppLocker policies by using the enforcement setting method.
-MSHAttr: PreferredLib /library
 ms.assetid: fd3a3d25-ff3b-4060-8390-6262a90749ba
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/deploy-the-applocker-policy-into-production.md b/windows/keep-secure/deploy-the-applocker-policy-into-production.md
index db2d0cd0e1..da107fefad 100644
--- a/windows/keep-secure/deploy-the-applocker-policy-into-production.md
+++ b/windows/keep-secure/deploy-the-applocker-policy-into-production.md
@@ -1,7 +1,6 @@
 ---
 title: Deploy the AppLocker policy into production (Windows 10)
 description: This topic for the IT professional describes the tasks that should be completed before you deploy AppLocker application control settings.
-MSHAttr: PreferredLib /library
 ms.assetid: ebbb1907-92dc-499e-8cee-8e637483c9ae
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/determine-group-policy-structure-and-rule-enforcement.md b/windows/keep-secure/determine-group-policy-structure-and-rule-enforcement.md
index b9754eea86..8fc14ddac0 100644
--- a/windows/keep-secure/determine-group-policy-structure-and-rule-enforcement.md
+++ b/windows/keep-secure/determine-group-policy-structure-and-rule-enforcement.md
@@ -1,7 +1,6 @@
 ---
 title: Determine the Group Policy structure and rule enforcement (Windows 10)
 description: This overview topic describes the process to follow when you are planning to deploy AppLocker rules.
-MSHAttr: PreferredLib /library
 ms.assetid: f435fcbe-c7ac-4ef0-9702-729aab64163f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/determine-which-applications-are-digitally-signed-on-a-reference-computer.md b/windows/keep-secure/determine-which-applications-are-digitally-signed-on-a-reference-computer.md
index 8f9ec8eff6..b909f207d6 100644
--- a/windows/keep-secure/determine-which-applications-are-digitally-signed-on-a-reference-computer.md
+++ b/windows/keep-secure/determine-which-applications-are-digitally-signed-on-a-reference-computer.md
@@ -1,7 +1,6 @@
 ---
 title: Determine which apps are digitally signed on a reference device (Windows 10)
 description: This topic for the IT professional describes how to use AppLocker logs and tools to determine which applications are digitally signed.
-MSHAttr: PreferredLib /library
 ms.assetid: 24609a6b-fdcb-4083-b234-73e23ff8bcb8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/determine-your-application-control-objectives.md b/windows/keep-secure/determine-your-application-control-objectives.md
index cc5c7b271a..e48556261c 100644
--- a/windows/keep-secure/determine-your-application-control-objectives.md
+++ b/windows/keep-secure/determine-your-application-control-objectives.md
@@ -1,7 +1,6 @@
 ---
 title: Determine your application control objectives (Windows 10)
 description: This topic helps you with the decisions you need to make to determine what applications to control and how to control them by comparing Software Restriction Policies (SRP) and AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 0e84003e-6095-46fb-8c4e-2065869bb53b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/device-guard-certification-and-compliance.md b/windows/keep-secure/device-guard-certification-and-compliance.md
index 30d2a816db..4fba3a5dc4 100644
--- a/windows/keep-secure/device-guard-certification-and-compliance.md
+++ b/windows/keep-secure/device-guard-certification-and-compliance.md
@@ -1,7 +1,6 @@
 ---
 title: Device Guard certification and compliance (Windows 10)
-description: Device Guard is a combination of hardware and software security features that when configured together will lock a device down so that it can only run trusted applications.
-MSHAttr: PreferredLib /library
+description: Device Guard is a combination of hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications.
 ms.assetid: 94167ECA-AB08-431D-95E5-7A363F42C7E3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -102,10 +101,9 @@ The following table shows the hardware and software you need to install and conf
 <tr class="even">
 <td align="left"><p>Firmware lock</p></td>
 <td align="left"><ul>
-<li><p>The firmware setup should be locked to prevent other operating systems from starting and to prevent changes to the UEFI settings. You should also disable boot methods other than from the hard drive and configured to suit enterprise customer requirements.</p></li>
-<li><p>The Microsoft UEFI certification authority must be removed from Secure Boot database.</p></li>
-<li><p>You must provide the ability to add an OEM or enterprise certificate to the Secure Boot database.</p></li>
-<li><p>Firmware password or higher authentication must be required to change firmware settings.</p></li>
+<li><p>The firmware setup should be locked to prevent other operating systems from starting and to prevent changes to the UEFI settings.</p></li>
+<li><p>• Work with your hardware manufacturer to ensure that the devices are Device Guard ready</p></li>
+<li><p>You should require a firmware password or higher authentication to change firmware settings.</p></li>
 </ul></td>
 </tr>
 <tr class="odd">
diff --git a/windows/keep-secure/device-guard-deployment-guide.md b/windows/keep-secure/device-guard-deployment-guide.md
index 9ade796ddc..cdedb8169e 100644
--- a/windows/keep-secure/device-guard-deployment-guide.md
+++ b/windows/keep-secure/device-guard-deployment-guide.md
@@ -1,7 +1,6 @@
 ---
 title: Device Guard deployment guide (Windows 10)
 description: Microsoft Device Guard is a feature set that consists of both hardware and software system integrity hardening features that revolutionize the Windows operating system’s security.
-MSHAttr: PreferredLib /library
 ms.assetid: 4BA52AA9-64D3-41F3-94B2-B87EC2717486
 keywords: ["virtualization", "security", "malware"]
 ms.prod: W10
@@ -16,22 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Introduction to Device Guard](#introduction-to-device-guard)
--   [Device Guard overview](#device-guard-overview)
--   [Plan for Device Guard](#plan-for-device-guard)
--   [Approach enterprise code integrity deployment](#approach-enterprise)
--   [Device Guard deployment scenarios](#device-guard-deployment)
--   [Code signing adoption](#code-signing-adoption)
--   [Hardware considerations](#hardware)
--   [Device Guard deployment](#dg-deployment)
--   [Configure hardware-based security features](#configure-hardware)
--   [Catalog files](#catalog-files)
--   [Code integrity policies](#code-integrity-policies)
--   [Create a Device Guard code signing certificate](#create-dg-code)
--   [Related topics](#related-topics)
-
 Microsoft Device Guard is a feature set that consists of both hardware and software system integrity hardening features that revolutionize the Windows operating system’s security. Windows 10 employs Device Guard as well as code integrity and advanced hardware features such as CPU virtualization extensions, Trusted Platform Module, and second-level address translation to offer comprehensive modern security to its users. This guide explores the individual features in Device Guard as well as how to plan for, configure, and deploy them.
 
 ## Introduction to Device Guard
@@ -244,10 +227,9 @@ Different hardware features are required to implement the various features of De
 <tr class="even">
 <td align="left"><p>Firmware lock</p></td>
 <td align="left"><ul>
-<li><p>The firmware setup should be locked to prevent other operating systems from starting and to prevent changes to the UEFI settings. You should also disable boot methods other than from the hard drive and configured to suit enterprise customer requirements.</p></li>
-<li><p>The Microsoft UEFI certification authority must be removed from Secure Boot database.</p></li>
-<li><p>You must provide the ability to add an OEM or enterprise certificate to the Secure Boot database.</p></li>
-<li><p>Firmware password or higher authentication must be required to change firmware settings.</p></li>
+<li><p>The firmware setup should be locked to prevent other operating systems from starting and to prevent changes to the UEFI settings.</p></li>
+<li><p>Work with your hardware manufacturer to ensure that the devices are Device Guard ready.</p></li>
+<li><p>You should require a firmware password or higher authentication to change firmware settings.</p></li>
 </ul></td>
 </tr>
 <tr class="odd">
diff --git a/windows/keep-secure/devices-allow-undock-without-having-to-log-on.md b/windows/keep-secure/devices-allow-undock-without-having-to-log-on.md
index f0e94e0ec5..5b03d0aedc 100644
--- a/windows/keep-secure/devices-allow-undock-without-having-to-log-on.md
+++ b/windows/keep-secure/devices-allow-undock-without-having-to-log-on.md
@@ -1,7 +1,6 @@
 ---
 title: Devices Allow undock without having to log on (Windows 10)
-description: Describes the best practices location values and security considerations for the Devices Allow undock without having to log on security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Devices Allow undock without having to log on security policy setting.
 ms.assetid: 1d403f5d-ad41-4bb4-9f4a-0779c1c14b8c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Devices: Allow undock without having to log on** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md b/windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md
index 2669c34389..40c23ebc27 100644
--- a/windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md
+++ b/windows/keep-secure/devices-allowed-to-format-and-eject-removable-media.md
@@ -1,7 +1,6 @@
 ---
 title: Devices Allowed to format and eject removable media (Windows 10)
-description: Describes the best practices location values and security considerations for the Devices Allowed to format and eject removable media security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Devices Allowed to format and eject removable media security policy setting.
 ms.assetid: d1b42425-7244-4ab1-9d46-d68de823459c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Devices: Allowed to format and eject removable media** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md b/windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md
index bb2aa5f5a9..b6c244f268 100644
--- a/windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md
+++ b/windows/keep-secure/devices-prevent-users-from-installing-printer-drivers.md
@@ -1,7 +1,6 @@
 ---
 title: Devices Prevent users from installing printer drivers (Windows 10)
-description: Describes the best practices location values and security considerations for the Devices Prevent users from installing printer drivers security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Devices Prevent users from installing printer drivers security policy setting.
 ms.assetid: ab70a122-f7f9-47e0-ad8c-541f30a27ec3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Devices: Prevent users from installing printer drivers** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md b/windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
index a50766fedb..4a6476a263 100644
--- a/windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
+++ b/windows/keep-secure/devices-restrict-cd-rom-access-to-locally-logged-on-user-only.md
@@ -1,7 +1,6 @@
 ---
-title: Devices Restrict CD ROM access to locally logged on user only (Windows 10)
-description: Describes the best practices location values and security considerations for the Devices Restrict CD ROM access to locally logged on user only security policy setting.
-MSHAttr: PreferredLib /library
+title: Devices Restrict CD-ROM access to locally logged-on user only (Windows 10)
+description: Describes the best practices, location, values, and security considerations for the Devices Restrict CD-ROM access to locally logged-on user only security policy setting.
 ms.assetid: 8b8f44bb-84ce-4f18-af30-ab89910e234d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Devices: Restrict CD-ROM access to locally logged-on user only** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md b/windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
index c5520ce716..ade06f8756 100644
--- a/windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
+++ b/windows/keep-secure/devices-restrict-floppy-access-to-locally-logged-on-user-only.md
@@ -1,7 +1,6 @@
 ---
-title: Devices Restrict floppy access to locally logged on user only (Windows 10)
-description: Describes the best practices location values and security considerations for the Devices Restrict floppy access to locally logged on user only security policy setting.
-MSHAttr: PreferredLib /library
+title: Devices Restrict floppy access to locally logged-on user only (Windows 10)
+description: Describes the best practices, location, values, and security considerations for the Devices Restrict floppy access to locally logged-on user only security policy setting.
 ms.assetid: 92997910-da95-4c03-ae6f-832915423898
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Devices: Restrict floppy access to locally logged-on user only** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md b/windows/keep-secure/display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md
index e2bc14b253..1cd3b2b2c5 100644
--- a/windows/keep-secure/display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md
+++ b/windows/keep-secure/display-a-custom-url-message-when-users-try-to-run-a-blocked-application.md
@@ -1,7 +1,6 @@
 ---
 title: Display a custom URL message when users try to run a blocked app (Windows 10)
 description: This topic for IT professionals describes the steps for displaying a customized message to users when an AppLocker policy denies access to an app.
-MSHAttr: PreferredLib /library
 ms.assetid: 9a2534a5-d1fa-48a9-93c6-989d4857cf85
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/dll-rules-in-applocker.md b/windows/keep-secure/dll-rules-in-applocker.md
index db541037f7..aeabe9379e 100644
--- a/windows/keep-secure/dll-rules-in-applocker.md
+++ b/windows/keep-secure/dll-rules-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: DLL rules in AppLocker (Windows 10)
 description: This topic describes the file formats and available default rules for the DLL rule collection.
-MSHAttr: PreferredLib /library
 ms.assetid: a083fd08-c07e-4534-b0e7-1e15d932ce8f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/document-group-policy-structure-and-applocker-rule-enforcement.md b/windows/keep-secure/document-group-policy-structure-and-applocker-rule-enforcement.md
index dfeb603173..a3e357256e 100644
--- a/windows/keep-secure/document-group-policy-structure-and-applocker-rule-enforcement.md
+++ b/windows/keep-secure/document-group-policy-structure-and-applocker-rule-enforcement.md
@@ -1,7 +1,6 @@
 ---
 title: Document the Group Policy structure and AppLocker rule enforcement (Windows 10)
-description: This planning topic describes what you need to investigate determine and record in your application control policies plan when you use AppLocker.
-MSHAttr: PreferredLib /library
+description: This planning topic describes what you need to investigate, determine, and record in your application control policies plan when you use AppLocker.
 ms.assetid: 389ffa8e-11fc-49ff-b0b1-89553e6fb6e5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/document-your-application-control-management-processes.md b/windows/keep-secure/document-your-application-control-management-processes.md
index 2a0ce66bd1..c5d5c7ecf4 100644
--- a/windows/keep-secure/document-your-application-control-management-processes.md
+++ b/windows/keep-secure/document-your-application-control-management-processes.md
@@ -1,7 +1,6 @@
 ---
 title: Document your application control management processes (Windows 10)
 description: This planning topic describes the AppLocker policy maintenance information to record for your design document.
-MSHAttr: PreferredLib /library
 ms.assetid: 6397f789-0e36-4933-9f86-f3f6489cf1fb
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/document-your-application-list.md b/windows/keep-secure/document-your-application-list.md
index d5b11b8be4..89cf353d55 100644
--- a/windows/keep-secure/document-your-application-list.md
+++ b/windows/keep-secure/document-your-application-list.md
@@ -1,7 +1,6 @@
 ---
 title: Document your app list (Windows 10)
 description: This planning topic describes the app information that you should document when you create a list of apps for AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: b155284b-f75d-4405-aecf-b74221622dc0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/document-your-applocker-rules.md b/windows/keep-secure/document-your-applocker-rules.md
index 26f4b17f54..9abb8817ee 100644
--- a/windows/keep-secure/document-your-applocker-rules.md
+++ b/windows/keep-secure/document-your-applocker-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Document your AppLocker rules (Windows 10)
-description: This topic describes what rule conditions to associate with each file how to associate the rule conditions with each file the source of the rule and whether the file should be included or excluded.
-MSHAttr: PreferredLib /library
+description: This topic describes what rule conditions to associate with each file, how to associate the rule conditions with each file, the source of the rule, and whether the file should be included or excluded.
 ms.assetid: 91a198ce-104a-45ff-b49b-487fb40cd2dd
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md b/windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md
index 0766821b46..de5c0393cd 100644
--- a/windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md
+++ b/windows/keep-secure/domain-controller-allow-server-operators-to-schedule-tasks.md
@@ -1,7 +1,6 @@
 ---
 title: Domain controller Allow server operators to schedule tasks (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain controller Allow server operators to schedule tasks security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain controller Allow server operators to schedule tasks security policy setting.
 ms.assetid: 198b12a4-8a5d-48e8-a752-2073b8a2cb0d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain controller: Allow server operators to schedule tasks** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-controller-ldap-server-signing-requirements.md b/windows/keep-secure/domain-controller-ldap-server-signing-requirements.md
index 8ab2241209..72848b8339 100644
--- a/windows/keep-secure/domain-controller-ldap-server-signing-requirements.md
+++ b/windows/keep-secure/domain-controller-ldap-server-signing-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: Domain controller LDAP server signing requirements (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain controller LDAP server signing requirements security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain controller LDAP server signing requirements security policy setting.
 ms.assetid: fe122179-7571-465b-98d0-b8ce0f224390
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain controller: LDAP server signing requirements** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md b/windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md
index 2c6c385a5f..8b810e64e2 100644
--- a/windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md
+++ b/windows/keep-secure/domain-controller-refuse-machine-account-password-changes.md
@@ -1,7 +1,6 @@
 ---
 title: Domain controller Refuse machine account password changes (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain controller Refuse machine account password changes security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain controller Refuse machine account password changes security policy setting.
 ms.assetid: 5a7fa2e2-e1a8-4833-90f7-aa83e3b456a9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain controller: Refuse machine account password changes** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data--always.md b/windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data--always.md
index 780551f5dd..b2b1fda6b9 100644
--- a/windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data--always.md
+++ b/windows/keep-secure/domain-member-digitally-encrypt-or-sign-secure-channel-data--always.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Digitally encrypt or sign secure channel data (always) (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Digitally encrypt or sign secure channel data (always) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Digitally encrypt or sign secure channel data (always) security policy setting.
 ms.assetid: 4480c7cb-adca-4f29-b4b8-06eb68d272bf
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Digitally encrypt or sign secure channel data (always)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data--when-possible.md b/windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data--when-possible.md
index 5e556d32f8..2cb90d0766 100644
--- a/windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data--when-possible.md
+++ b/windows/keep-secure/domain-member-digitally-encrypt-secure-channel-data--when-possible.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Digitally encrypt secure channel data (when possible) (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Digitally encrypt secure channel data (when possible) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Digitally encrypt secure channel data (when possible) security policy setting.
 ms.assetid: 73e6023e-0af3-4531-8238-82f0f0e4965b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Digitally encrypt secure channel data (when possible)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-digitally-sign-secure-channel-data--when-possible.md b/windows/keep-secure/domain-member-digitally-sign-secure-channel-data--when-possible.md
index 96c17ac8cc..5358865f86 100644
--- a/windows/keep-secure/domain-member-digitally-sign-secure-channel-data--when-possible.md
+++ b/windows/keep-secure/domain-member-digitally-sign-secure-channel-data--when-possible.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Digitally sign secure channel data (when possible) (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Digitally sign secure channel data (when possible) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Digitally sign secure channel data (when possible) security policy setting.
 ms.assetid: a643e491-4f45-40ea-b12c-4dbe47e54f34
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Digitally sign secure channel data (when possible)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-disable-machine-account-password-changes.md b/windows/keep-secure/domain-member-disable-machine-account-password-changes.md
index aed1375664..e25f87d1fa 100644
--- a/windows/keep-secure/domain-member-disable-machine-account-password-changes.md
+++ b/windows/keep-secure/domain-member-disable-machine-account-password-changes.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Disable machine account password changes (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Disable machine account password changes security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Disable machine account password changes security policy setting.
 ms.assetid: 1f660300-a07a-4243-a09f-140aa1ab8867
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Disable machine account password changes** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-maximum-machine-account-password-age.md b/windows/keep-secure/domain-member-maximum-machine-account-password-age.md
index c3eb120f68..78a8d9b843 100644
--- a/windows/keep-secure/domain-member-maximum-machine-account-password-age.md
+++ b/windows/keep-secure/domain-member-maximum-machine-account-password-age.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Maximum machine account password age (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Maximum machine account password age security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Maximum machine account password age security policy setting.
 ms.assetid: 0ec6f7c1-4d82-4339-94c0-debb2d1ac109
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Maximum machine account password age** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/domain-member-require-strong--windows-2000-or-later--session-key.md b/windows/keep-secure/domain-member-require-strong--windows-2000-or-later--session-key.md
index 96d961b3d8..b230c318e1 100644
--- a/windows/keep-secure/domain-member-require-strong--windows-2000-or-later--session-key.md
+++ b/windows/keep-secure/domain-member-require-strong--windows-2000-or-later--session-key.md
@@ -1,7 +1,6 @@
 ---
 title: Domain member Require strong (Windows 2000 or later) session key (Windows 10)
-description: Describes the best practices location values and security considerations for the Domain member Require strong (Windows 2000 or later) session key security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Domain member Require strong (Windows 2000 or later) session key security policy setting.
 ms.assetid: 5ab8993c-5086-4f09-bc88-1b27454526bd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Domain member: Require strong (Windows 2000 or later) session key** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/edit-an-applocker-policy.md b/windows/keep-secure/edit-an-applocker-policy.md
index e7302d7d96..b878d37679 100644
--- a/windows/keep-secure/edit-an-applocker-policy.md
+++ b/windows/keep-secure/edit-an-applocker-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Edit an AppLocker policy (Windows 10)
 description: This topic for IT professionals describes the steps required to modify an AppLocker policy.
-MSHAttr: PreferredLib /library
 ms.assetid: dbc72d1f-3fe0-46c2-aeeb-96621fce7637
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/edit-applocker-rules.md b/windows/keep-secure/edit-applocker-rules.md
index 14ebc26a29..e5b8372c9d 100644
--- a/windows/keep-secure/edit-applocker-rules.md
+++ b/windows/keep-secure/edit-applocker-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Edit AppLocker rules (Windows 10)
-description: This topic for IT professionals describes the steps to edit a publisher rule path rule and file hash rule in AppLocker.
-MSHAttr: PreferredLib /library
+description: This topic for IT professionals describes the steps to edit a publisher rule, path rule, and file hash rule in AppLocker.
 ms.assetid: 80016cda-b915-46a0-83c6-5e6b0b958e32
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md b/windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
index d425454cc9..34680d437c 100644
--- a/windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
+++ b/windows/keep-secure/enable-computer-and-user-accounts-to-be-trusted-for-delegation.md
@@ -1,7 +1,6 @@
 ---
 title: Enable computer and user accounts to be trusted for delegation (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Enable computer and user accounts to be trusted for delegation security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Enable computer and user accounts to be trusted for delegation security policy setting.
 ms.assetid: 524062d4-1595-41f3-8ce1-9c85fd21497b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Enable computer and user accounts to be trusted for delegation** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/enable-the-dll-rule-collection.md b/windows/keep-secure/enable-the-dll-rule-collection.md
index b7249cb8d4..903c1b67bf 100644
--- a/windows/keep-secure/enable-the-dll-rule-collection.md
+++ b/windows/keep-secure/enable-the-dll-rule-collection.md
@@ -1,7 +1,6 @@
 ---
 title: Enable the DLL rule collection (Windows 10)
 description: This topic for IT professionals describes the steps to enable the DLL rule collection feature for AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 88ef9561-6eb2-491a-803a-b8cdbfebae27
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/encrypted-hard-drive.md b/windows/keep-secure/encrypted-hard-drive.md
index 39b4285985..b283dc1b4c 100644
--- a/windows/keep-secure/encrypted-hard-drive.md
+++ b/windows/keep-secure/encrypted-hard-drive.md
@@ -1,7 +1,6 @@
 ---
 title: Encrypted Hard Drive (Windows 10)
 description: Encrypted Hard Drive uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.
-MSHAttr: PreferredLib /library
 ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/enforce-applocker-rules.md b/windows/keep-secure/enforce-applocker-rules.md
index 06b83c2266..0e2fcdd077 100644
--- a/windows/keep-secure/enforce-applocker-rules.md
+++ b/windows/keep-secure/enforce-applocker-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Enforce AppLocker rules (Windows 10)
 description: This topic for IT professionals describes how to enforce application control rules by using AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: e1528b7b-77f2-4419-8e27-c9cc3721d96d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/enforce-password-history.md b/windows/keep-secure/enforce-password-history.md
index 40545cd695..8a06a8f98b 100644
--- a/windows/keep-secure/enforce-password-history.md
+++ b/windows/keep-secure/enforce-password-history.md
@@ -1,7 +1,6 @@
 ---
 title: Enforce password history (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Enforce password history security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Enforce password history security policy setting.
 ms.assetid: 8b2ab871-3e52-4dd1-9776-68bb1e935442
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Enforce password history** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/enforce-user-logon-restrictions.md b/windows/keep-secure/enforce-user-logon-restrictions.md
index 82aa274916..18dd084c4c 100644
--- a/windows/keep-secure/enforce-user-logon-restrictions.md
+++ b/windows/keep-secure/enforce-user-logon-restrictions.md
@@ -1,7 +1,6 @@
 ---
 title: Enforce user logon restrictions (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Enforce user logon restrictions security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Enforce user logon restrictions security policy setting.
 ms.assetid: 5891cb73-f1ec-48b9-b703-39249e48a29f
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Enforce user logon restrictions** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/enterprise-security-guides-portal.md b/windows/keep-secure/enterprise-security-guides-portal.md
index ff28abc223..7422955a9c 100644
--- a/windows/keep-secure/enterprise-security-guides-portal.md
+++ b/windows/keep-secure/enterprise-security-guides-portal.md
@@ -1,7 +1,6 @@
 ---
 title: Enterprise security guides (Windows 10)
-description: Get proven guidance to help you better secure and protect your enterprise by using technologies such as Credential Guard Device Guard Microsoft Passport and Windows Hello. This section offers technology overviews and step by step guides.
-MSHAttr: PreferredLib /library
+description: Get proven guidance to help you better secure and protect your enterprise by using technologies such as Credential Guard, Device Guard, Microsoft Passport, and Windows Hello. This section offers technology overviews and step-by-step guides.
 ms.assetid: 57134f84-bd4b-4b1d-b663-4a2d36f5a7f8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/executable-rules-in-applocker.md b/windows/keep-secure/executable-rules-in-applocker.md
index 5aeef079a2..9bc04a00e9 100644
--- a/windows/keep-secure/executable-rules-in-applocker.md
+++ b/windows/keep-secure/executable-rules-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Executable rules in AppLocker (Windows 10)
 description: This topic describes the file formats and available default rules for the executable rule collection.
-MSHAttr: PreferredLib /library
 ms.assetid: 65e62f90-6caa-48f8-836a-91f8ac9018ee
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/export-an-applocker-policy-from-a-gpo.md b/windows/keep-secure/export-an-applocker-policy-from-a-gpo.md
index 14e056f154..4d3bebaea0 100644
--- a/windows/keep-secure/export-an-applocker-policy-from-a-gpo.md
+++ b/windows/keep-secure/export-an-applocker-policy-from-a-gpo.md
@@ -1,7 +1,6 @@
 ---
 title: Export an AppLocker policy from a GPO (Windows 10)
 description: This topic for IT professionals describes the steps to export an AppLocker policy from a Group Policy Object (GPO) so that it can be modified.
-MSHAttr: PreferredLib /library
 ms.assetid: 7db59719-a8be-418b-bbfd-22cf2176c9c0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/export-an-applocker-policy-to-an-xml-file.md b/windows/keep-secure/export-an-applocker-policy-to-an-xml-file.md
index 1eed70fc04..db8273ad60 100644
--- a/windows/keep-secure/export-an-applocker-policy-to-an-xml-file.md
+++ b/windows/keep-secure/export-an-applocker-policy-to-an-xml-file.md
@@ -1,7 +1,6 @@
 ---
 title: Export an AppLocker policy to an XML file (Windows 10)
 description: This topic for IT professionals describes the steps to export an AppLocker policy to an XML file for review or testing.
-MSHAttr: PreferredLib /library
 ms.assetid: 979bd23f-6815-478b-a6a4-a25239cb1080
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/file-system--global-object-access-auditing--sec-audit.md b/windows/keep-secure/file-system--global-object-access-auditing--sec-audit.md
index 8fb57832ef..b9eaa059fb 100644
--- a/windows/keep-secure/file-system--global-object-access-auditing--sec-audit.md
+++ b/windows/keep-secure/file-system--global-object-access-auditing--sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: File System (Global Object Access Auditing) (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting File System (Global Object Access Auditing) which enables you to configure a global system access control list (SACL) on the file system for an entire computer.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, File System (Global Object Access Auditing), which enables you to configure a global system access control list (SACL) on the file system for an entire computer.
 ms.assetid: 4f215d61-0e23-46e4-9e58-08511105d25b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/force-shutdown-from-a-remote-system.md b/windows/keep-secure/force-shutdown-from-a-remote-system.md
index 2ffd79f7c3..28d7bc97d6 100644
--- a/windows/keep-secure/force-shutdown-from-a-remote-system.md
+++ b/windows/keep-secure/force-shutdown-from-a-remote-system.md
@@ -1,7 +1,6 @@
 ---
 title: Force shutdown from a remote system (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Force shutdown from a remote system security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Force shutdown from a remote system security policy setting.
 ms.assetid: 63129243-31ea-42a4-a598-c7064f48a3df
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Force shutdown from a remote system** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/generate-security-audits.md b/windows/keep-secure/generate-security-audits.md
index 3f27b43b63..db7aaf05aa 100644
--- a/windows/keep-secure/generate-security-audits.md
+++ b/windows/keep-secure/generate-security-audits.md
@@ -1,7 +1,6 @@
 ---
 title: Generate security audits (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Generate security audits security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Generate security audits security policy setting.
 ms.assetid: c0e1cd80-840e-4c74-917c-5c2349de885f
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Generate security audits** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md
index 080ee75b32..2ddba6821a 100644
--- a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md
+++ b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Update and manage Windows Defender in Windows 10 (Windows 10)
-description: IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Microsoft Active Directory or Windows Server Update Services (WSUS) and apply updates to endpoints.
-MSHAttr: PreferredLib /library
+description: IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Microsoft Active Directory or Windows Server Update Services (WSUS), apply updates to endpoints, and manage scans using Group Policy SettingsWindows Management Instrumentation (WMI)Windows PowerShell.
 ms.assetid: 045F5BF2-87D7-4522-97E1-C1D508E063A7
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -16,13 +15,11 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
+IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Microsoft Active Directory or Windows Server Update Services (WSUS), apply updates to endpoints, and manage scans using:
 
--   [Manage Windows Defender endpoints through Active Directory and WSUS](#manage-windows-defender-endpoints-through-active-directory-and-wsus)
--   [Apply updates to Windows Defender endpoints](#apply-updates-to-windows-defender-endpoints)
--   [Related topics](#related-topics)
-
-IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Microsoft Active Directory or Windows Server Update Services (WSUS), and apply updates to endpoints.
+-   Group Policy Settings
+-   Windows Management Instrumentation (WMI)
+-   Windows PowerShell
 
 ## Manage Windows Defender endpoints through Active Directory and WSUS
 
@@ -60,6 +57,164 @@ It is important to keep Windows Defender endpoints updated to ensure they are pr
 
 You can manage the distribution of updates through the [Windows Server Update Services (WSUS)](https://technet.microsoft.com/windowsserver/bb332157).
 
+## Manage email scans in Windows Defender
+
+
+You can use Windows Defender to scan email files. Malware can install itself and hide in email files, and although real-time protection offers you the best protection from email malware, you can also scan emails stored on your PC or server with Windows Defender.
+
+**Important**  Mail scanning only applies to on-demand and scheduled scans, not on-access scans.
+
+ 
+
+Windows Defender scans Microsoft Office Outlook 2003 and older email files. We identify the file type at run-time based on the content of the file, not on location or extension.
+
+**Note**  Scanning email files might increase the time required to complete a scan.
+
+ 
+
+Windows Defender can extract embedded objects within a file (attachments and archived files, for example) and scan internally.
+
+**Note**  While Windows Defender can be configured to scan email files, it can only remediate threats detected inside certain files, for example:
+-   DBX
+-   MBX
+-   MIME
+
+ 
+
+You can configure Windows Defender to scan PST files used by Outlook 2003 or older versions (where the archive type is set to non-uni-code), but Windows Defender cannot remediate threats detected inside PST files. We recommend using real-time protection to protect against email malware.
+
+If Windows Defender detects a threat inside an email, it will show you the following information to assist you in identifying the compromised email, so you can remediate the threat:
+
+-   Email subject
+-   Attachment name
+
+Email scanning in Windows Defender is turned off by default. There are three ways you can manage scans through Windows Defender:
+
+-   *Group Policy* settings
+-   WMI
+-   PowerShell
+
+**Important**  There are some risks associated with scanning some Microsoft Outlook files and email messages. You can read about tips and risks associated with scanning Outlook files and email messages in the following articles:
+-   [Scanning Outlook files in Outlook 2013](https://technet.microsoft.com/library/dn769141.aspx#bkmk-1)
+-   [Scanning email messages in Outlook 2013](https://technet.microsoft.com/library/dn769141.aspx#bkmk-2)
+
+ 
+
+## Use *Group Policy* settings to enable email scans
+
+
+This policy setting allows you to turn on email scanning. When email scanning is enabled, the engine will parse the mailbox and mail files to analyze the mail bodies and attachments.
+
+Turn on email scanning with the following *Group Policy* settings:
+
+1.  Open the **Group Policy Editor**.
+2.  In the **Local Computer Policy** tree, expand **Computer Configuration**, then **Administrative Templates**, then **Windows Components**, then **Windows Defender**.
+3.  Click **Scan**.
+4.  Double-click **Turn on e-mail scanning**.
+
+    This will open the **Turn on e-mail scanning** window:
+
+5.  Select **Enabled**.
+6.  Click **OK** to apply changes.
+
+## Use WMI to disable email scans
+
+
+You can write a WMI script or application to disable email scanning. Read more about [WMI in this article](https://msdn.microsoft.com/library/windows/desktop/dn439477.aspx), and read about [Windows Preference classes in this article](https://msdn.microsoft.com/library/windows/desktop/dn455323.aspx).
+
+Use the **DisableEmailScanning** property of the **MSFT\_MpPreference** class (part of the Windows DefenderWMI provider) to enable or disable this setting:
+
+**DisableEmailScanning**
+Data type: **boolean**
+Access type: Read-only
+Disable email scanning.
+## Use PowerShell to enable email scans
+
+
+You can also enable email scanning using the following PowerShell parameter:
+
+1.  Open PowerShell or PowerShellIntegrated Scripting Environment (ISE).
+2.  Type **Set-MpPreference -DisableEmailScanning $false**.
+
+Read more about this in:
+
+-   • [Scripting with Windows PowerShell](https://technet.microsoft.com/library/bb978526.aspx)
+-   • [Defender Cmdlets](https://technet.microsoft.com/library/dn433280.aspx)
+
+## Manage archive scans in Windows Defender
+
+
+You can use Windows Defender to scan archive files. Malware can install itself and hide in archive files, and although real-time protection offers you the best protection from malware, you can also scan archives stored on your PC or server with Windows Defender.
+
+**Important**  Archive scanning only applies to on-demand and scheduled scans, not on-access scans.
+
+ 
+
+Archive scanning in Windows Defender is turned on by default. There are four ways you can manage scans through Windows Defender:
+
+-   *Group Policy* settings
+-   WMI
+-   PowerShell
+-   Endpoint Protection
+
+**Note**  Scanning archive files might increase the time required to complete a scan.
+
+ 
+
+If you exclude an archive file type by using the **Extensions** box, Windows Defender will not scan files with that extension (no matter what the content is), even when you have selected the **Scan archive files** check box. For example, if you exclude .rar files but there’s a .r00 file that’s actually .rar content, it will still be scanned if archive scanning is enabled.
+
+## Use *Group Policy* settings to enable archive scans
+
+
+This policy setting allows you to turn on archive scanning.
+
+Turn on email scanning with the following *Group Policy* settings:
+
+1.  Open the **Group Policy Editor**.
+2.  In the **Local Computer Policy** tree, expand **Computer Configuration**, then **Administrative Templates**, then **Windows Components**, then **Windows Defender**.
+3.  Click **Scan**.
+4.  Double-click **Scan archive files**.
+
+    This will open the **Scan archive files** window:
+
+5.  Select **Enabled**.
+6.  Click **OK** to apply changes.
+
+There are a number of archive scan settings in the **Scan** repository you can configure through *Group Policy*, for example:
+
+-   Maximum directory depth level into which archive files are unpacked during scanning
+-   Maximum size of archive files that will be scanned
+-   Maximum percentage CPU utilization permitted during a scan
+
+## Use WMI to disable archive scans
+
+
+You can write a WMI script or application to disable archive scanning. Read more about [WMI in this article](https://msdn.microsoft.com/library/windows/desktop/dn439477.aspx), and read about [Windows Preference classes in this article](https://msdn.microsoft.com/library/windows/desktop/dn455323.aspx).
+
+Use the **DisableArchiveScanning** property of the **MSFT\_MpPreference** class (part of the Windows DefenderWMI provider) to enable or disable this setting:
+
+**DisableArchiveScanning**
+Data type: **boolean**
+Access type: Read-only
+Disable archive scanning.
+## Use PowerShell to enable archive scans
+
+
+You can also enable archive scanning using the following PowerShell parameter:
+
+1.  Open PowerShell or PowerShellISE.
+2.  Type **Set-MpPreference -DisableArchiveScanning $false**.
+
+Read more about this in:
+
+-   • [Scripting with Windows PowerShell](https://technet.microsoft.com/library/bb978526.aspx)
+-   • [Defender Cmdlets](https://technet.microsoft.com/library/dn433280.aspx)
+
+## Use Endpoint Protection to configure archive scans
+
+
+In Endpoint Protection, you can use the advanced scanning options to configure archive scanning. For more information, see [What are advanced scanning options?](https://technet.microsoft.com/library/ff823807.aspx)
+
 ## Related topics
 
 
diff --git a/windows/keep-secure/getting-apps-to-run-on-device-guard-protected-devices.md b/windows/keep-secure/getting-apps-to-run-on-device-guard-protected-devices.md
index d25e990191..8ab0b6d888 100644
--- a/windows/keep-secure/getting-apps-to-run-on-device-guard-protected-devices.md
+++ b/windows/keep-secure/getting-apps-to-run-on-device-guard-protected-devices.md
@@ -1,7 +1,6 @@
 ---
-title: Get apps to run on Device Guard protected devices (Windows 10)
-description: Windows 10 introduces several new features and settings that when combined all equal what we're calling Device Guard.
-MSHAttr: PreferredLib /library
+title: Get apps to run on Device Guard-protected devices (Windows 10)
+description: Windows 10 introduces several new features and settings that when combined all equal what we're calling, Device Guard.
 ms.assetid: E62B68C3-8B9F-4842-90FC-B4EE9FF8A67E
 keywords: ["Package Inspector", "packageinspector.exe", "sign catalog file"]
 ms.prod: W10
@@ -17,14 +16,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [What you need to run your apps on Device-Guard protected devices](#what-you-need-to-run-your-apps-on-device-guard-protected-devices)
--   [Create a catalog file for unsigned apps](#create-a-catalog-file-for-unsigned-apps)
--   [Sign your catalog file using Sign Tool](#sign-your-catalog-file-using-sign-tool)
--   [Troubleshooting the Package Inspector](#troubleshooting-the-package-inspector)
--   [Related topics](#related-topics)
-
 Windows 10 introduces several new features and settings that when combined all equal what we're calling, Device Guard. Device Guard can help to protect your enterprise devices against the accidental running of malicious apps by requiring all of your apps to be signed by a trusted entity.
 
 To use Device Guard in an enterprise, you must be able to get your existing line-of-business and Independent Software Vendor (ISV)-developed apps to run on a protected device. Unfortunately, many line-of-business apps aren't signed, and in many cases, aren't even being actively developed. Similarly, you may have unsigned software from an ISV that you want to run, or you want to run certain applications from an ISV while not trusting all applications from that ISV. As part of the Device Guard features, Windows 10 includes a new tool called Package Inspector. Package Inspector scans your unsigned apps, and creates catalog files of the installed and running binaries, which can then be signed by the Sign Tool Windows SDK utility and distributed using Group Policy so that your apps will run on Device Guard-protected devices.
diff --git a/windows/keep-secure/how-applocker-works-techref.md b/windows/keep-secure/how-applocker-works-techref.md
index 2fa3e2b636..344c66263f 100644
--- a/windows/keep-secure/how-applocker-works-techref.md
+++ b/windows/keep-secure/how-applocker-works-techref.md
@@ -1,7 +1,6 @@
 ---
 title: How AppLocker works (Windows 10)
-description: This topic for the IT professional provides links to topics about AppLocker architecture and components processes and interactions rules and policies.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional provides links to topics about AppLocker architecture and components, processes and interactions, rules and policies.
 ms.assetid: 24bb1d73-0ff5-4af7-8b8a-2fa44d4ddbcd
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/how-to-configure-security-policy-settings.md b/windows/keep-secure/how-to-configure-security-policy-settings.md
index bfa76d516b..43a7e1c656 100644
--- a/windows/keep-secure/how-to-configure-security-policy-settings.md
+++ b/windows/keep-secure/how-to-configure-security-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Configure security policy settings (Windows 10)
-description: Describes steps to configure a security policy setting on the local device on a domain joined device and on a domain controller.
-MSHAttr: PreferredLib /library
+description: Describes steps to configure a security policy setting on the local device, on a domain-joined device, and on a domain controller.
 ms.assetid: 63b0967b-a9fe-4d92-90af-67469ee20320
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [To configure a setting using the Local Security Policy console](#bkmk-local)
--   [To configure a security policy setting using the Local Group Policy Editor console](#bkmk-domain)
--   [To configure a setting for a domain controller](#bkmk-dc)
--   [Related topics](#related-topics)
-
 Describes steps to configure a security policy setting on the local device, on a domain-joined device, and on a domain controller.
 
 You must have Administrators rights on the local device, or you must have the appropriate permissions to update a Group Policy Object (GPO) on the domain controller to perform these procedures.
diff --git a/windows/keep-secure/how-user-account-control-works.md b/windows/keep-secure/how-user-account-control-works.md
index 162360b304..c410eb2314 100644
--- a/windows/keep-secure/how-user-account-control-works.md
+++ b/windows/keep-secure/how-user-account-control-works.md
@@ -1,7 +1,6 @@
 ---
 title: How User Account Control works (Windows 10)
 description: User Account Control (UAC) is a fundamental component of Microsoft's overall security vision. UAC helps mitigate the impact of malware.
-MSHAttr: PreferredLib /library
 ms.assetid: 9f921779-0fd3-4206-b0e4-05a19883ee59
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/keep-secure/impersonate-a-client-after-authentication.md b/windows/keep-secure/impersonate-a-client-after-authentication.md
index b858cacdc0..c43d7641b6 100644
--- a/windows/keep-secure/impersonate-a-client-after-authentication.md
+++ b/windows/keep-secure/impersonate-a-client-after-authentication.md
@@ -1,7 +1,6 @@
 ---
 title: Impersonate a client after authentication (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Impersonate a client after authentication security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Impersonate a client after authentication security policy setting.
 ms.assetid: 4cd241e2-c680-4b43-8ed0-3b391925cec5
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Impersonate a client after authentication** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md
index c8511e1801..6c77863dbb 100644
--- a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md
+++ b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md
@@ -1,7 +1,6 @@
 ---
 title: Implement Microsoft Passport in your organization (Windows 10)
 description: You can create a Group Policy or mobile device management (MDM) policy that will implement Microsoft Passport on devices running Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: 47B55221-24BE-482D-BD31-C78B22AC06D8
 keywords: ["identity", "PIN", "biometric", "Hello"]
 ms.prod: W10
@@ -18,14 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Group Policy settings for Passport](#group-policy-settings-for-passport)
--   [MDM policy settings for Passport](#mdm-policy-settings-for-passport)
--   [Prerequisites](#prerequisites)
--   [Passport for BYOD](#passport-for-byod)
--   [Related topics](#related-topics)
-
 You can create a Group Policy or mobile device management (MDM) policy that will implement Microsoft Passport on devices running Windows 10.
 
 **Important**  
@@ -344,7 +335,7 @@ The work PIN is managed using the same Passport policies that you can use to man
 
 [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md)
 
-[Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+[Event ID 300 - Passport successfully created](passport-event-300.md)
 
  
 
diff --git a/windows/keep-secure/import-an-applocker-policy-from-another-computer.md b/windows/keep-secure/import-an-applocker-policy-from-another-computer.md
index f56baa8636..f8a57d092a 100644
--- a/windows/keep-secure/import-an-applocker-policy-from-another-computer.md
+++ b/windows/keep-secure/import-an-applocker-policy-from-another-computer.md
@@ -1,7 +1,6 @@
 ---
 title: Import an AppLocker policy from another computer (Windows 10)
 description: This topic for IT professionals describes how to import an AppLocker policy.
-MSHAttr: PreferredLib /library
 ms.assetid: b48cb2b2-8ef8-4cc0-89bd-309d0b1832f6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/import-an-applocker-policy-into-a-gpo.md b/windows/keep-secure/import-an-applocker-policy-into-a-gpo.md
index 4ce86537cd..5124290a7d 100644
--- a/windows/keep-secure/import-an-applocker-policy-into-a-gpo.md
+++ b/windows/keep-secure/import-an-applocker-policy-into-a-gpo.md
@@ -1,7 +1,6 @@
 ---
 title: Import an AppLocker policy into a GPO (Windows 10)
 description: This topic for IT professionals describes the steps to import an AppLocker policy into a Group Policy Object (GPO).
-MSHAttr: PreferredLib /library
 ms.assetid: 0629ce44-f5e2-48a8-ba47-06544c73261f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/increase-a-process-working-set.md b/windows/keep-secure/increase-a-process-working-set.md
index fa241e14f8..de979e2f5a 100644
--- a/windows/keep-secure/increase-a-process-working-set.md
+++ b/windows/keep-secure/increase-a-process-working-set.md
@@ -1,7 +1,6 @@
 ---
 title: Increase a process working set (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Increase a process working set security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Increase a process working set security policy setting.
 ms.assetid: b742ad96-37f3-4686-b8f7-f2b48367105b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Increase a process working set** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/increase-scheduling-priority.md b/windows/keep-secure/increase-scheduling-priority.md
index 6df69731fd..62107e69fa 100644
--- a/windows/keep-secure/increase-scheduling-priority.md
+++ b/windows/keep-secure/increase-scheduling-priority.md
@@ -1,7 +1,6 @@
 ---
 title: Increase scheduling priority (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Increase scheduling priority security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Increase scheduling priority security policy setting.
 ms.assetid: fbec5973-d35e-4797-9626-d0d56061527f
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Increase scheduling priority** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/index.md b/windows/keep-secure/index.md
index b2f0ab5868..71248e5e09 100644
--- a/windows/keep-secure/index.md
+++ b/windows/keep-secure/index.md
@@ -1,7 +1,6 @@
 ---
 title: Keep Windows 10 secure (Windows 10)
 description: Learn about keeping Windows 10 and Windows 10 Mobile secure.
-MSHAttr: PreferredLib /library
 ms.assetid: EA559BA8-734F-41DB-A74A-D8DBF36BE920
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -82,6 +81,11 @@ Learn about keeping Windows 10 and Windows 10 Mobile secure.
 
  
 
+## Related topics
+
+
+[Windows 10 and Windows 10 Mobile](../index.md)
+
  
 
  
diff --git a/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md b/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md
index 3788b06849..741bc28561 100644
--- a/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md
+++ b/windows/keep-secure/initialize-and-configure-ownership-of-the-tpm.md
@@ -1,7 +1,6 @@
 ---
 title: Initialize and configure ownership of the TPM (Windows 10)
-description: This topic for the IT professional describes how to initialize and set the ownership the Trusted Platform Module (TPM) turn the TPM on and off and clear TPM keys.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes how to initialize and set the ownership the Trusted Platform Module (TPM), turn the TPM on and off, and clear TPM keys.
 ms.assetid: 1166efaf-7aa3-4420-9279-435d9c6ac6f8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md b/windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md
index c45910ee56..ad2e5d3628 100644
--- a/windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md
+++ b/windows/keep-secure/installing-digital-certificates-on-windows-10-mobile.md
@@ -1,7 +1,6 @@
 ---
 title: Install digital certificates on Windows 10 Mobile (Windows 10)
 description: Digital certificates bind the identity of a user or computer to a pair of keys that can be used to encrypt and sign digital information.
-MSHAttr: PreferredLib /library
 ms.assetid: FF7B1BE9-41F4-44B0-A442-249B650CEE25
 keywords: ["S/MIME", "PFX", "SCEP"]
 ms.prod: W10
@@ -17,13 +16,6 @@ author: brianlic-msft
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Install certificates using Internet Explorer](#install-certificates-using-internet-explorer)
--   [Install certificates using email](#install-certificates-using-email)
--   [Install certificates using mobile device management (MDM)](#install-certificates-using-mobile-device-management--mdm-)
--   [Related topics](#related-topics)
-
 Digital certificates bind the identity of a user or computer to a pair of keys that can be used to encrypt and sign digital information. Certificates are issued by a certification authority (CA) that vouches for the identity of the certificate holder, and they enable secure client communications with websites and services.
 
 Certificates in Windows 10 Mobile are primarily used for the following purposes:
diff --git a/windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md b/windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md
index f7f49d029b..fc7f8995ad 100644
--- a/windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md
+++ b/windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Display user information when the session is locked (Windows 10)
-description: Describes the best practices location values and security considerations for the Interactive logon Display user information when the session is locked security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Interactive logon Display user information when the session is locked security policy setting.
 ms.assetid: 9146aa3d-9b2f-47ba-ac03-ff43efb10530
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Interactive logon: Display user information when the session is locked** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-do-not-display-last-user-name.md b/windows/keep-secure/interactive-logon-do-not-display-last-user-name.md
index 10dc748999..c8547849bb 100644
--- a/windows/keep-secure/interactive-logon-do-not-display-last-user-name.md
+++ b/windows/keep-secure/interactive-logon-do-not-display-last-user-name.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Do not display last user name (Windows 10)
-description: Describes the best practices location values and security considerations for the Interactive logon Do not display last user name security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Interactive logon Do not display last user name security policy setting.
 ms.assetid: 98b24b03-95fe-4edc-8e97-cbdaa8e314fd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not display last user name** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md b/windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md
index 6760cfa165..daac336396 100644
--- a/windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md
+++ b/windows/keep-secure/interactive-logon-do-not-require-ctrl-alt-del.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Do not require CTRL+ALT+DEL (Windows 10)
-description: Describes the best practices location values and security considerations for the Interactive logon Do not require CTRL+ALT+DEL security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Interactive logon Do not require CTRL+ALT+DEL security policy setting.
 ms.assetid: 04e2c000-2eb2-4d4b-8179-1e2cb4793e18
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Interactive logon: Do not require CTRL+ALT+DEL** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md b/windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md
index 960cfef4b0..871200c86d 100644
--- a/windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md
+++ b/windows/keep-secure/interactive-logon-machine-account-lockout-threshold.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Machine account lockout threshold (Windows 10)
-description: Describes the best practices location values management and security considerations for the Interactive logon Machine account lockout threshold security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management, and security considerations for the Interactive logon Machine account lockout threshold security policy setting.
 ms.assetid: ebbd8e22-2611-4ebe-9db9-d49344e631e4
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine account lockout threshold** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-machine-inactivity-limit.md b/windows/keep-secure/interactive-logon-machine-inactivity-limit.md
index 654595d0b3..ac48acba83 100644
--- a/windows/keep-secure/interactive-logon-machine-inactivity-limit.md
+++ b/windows/keep-secure/interactive-logon-machine-inactivity-limit.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Machine inactivity limit (Windows 10)
-description: Describes the best practices location values management and security considerations for the Interactive logon Machine inactivity limit security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management, and security considerations for the Interactive logon Machine inactivity limit security policy setting.
 ms.assetid: 7065b4a9-0d52-41d5-afc4-5aedfc4162b5
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Machine inactivity limit** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md b/windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md
index 708b46d11b..c3ae488699 100644
--- a/windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md
+++ b/windows/keep-secure/interactive-logon-message-text-for-users-attempting-to-log-on.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Message text for users attempting to log on (Windows 10)
-description: Describes the best practices location values management and security considerations for the Interactive logon Message text for users attempting to log on security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management, and security considerations for the Interactive logon Message text for users attempting to log on security policy setting.
 ms.assetid: fcfe8a6d-ca65-4403-b9e6-2fa017a31c2e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management, and security considerations for the **Interactive logon: Message text for users attempting to log on** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md b/windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md
index fbdca3169b..7c09c135ab 100644
--- a/windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md
+++ b/windows/keep-secure/interactive-logon-message-title-for-users-attempting-to-log-on.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Message title for users attempting to log on (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Message title for users attempting to log on security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Interactive logon Message title for users attempting to log on security policy setting.
 ms.assetid: f2596470-4cc0-4ef1-849c-bef9dc3533c6
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Interactive logon: Message title for users attempting to log on** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache--in-case-domain-controller-is-not-available.md b/windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache--in-case-domain-controller-is-not-available.md
index d4bb3c0d0b..2fa2d1f18d 100644
--- a/windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache--in-case-domain-controller-is-not-available.md
+++ b/windows/keep-secure/interactive-logon-number-of-previous-logons-to-cache--in-case-domain-controller-is-not-available.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Number of previous logons to cache (in case domain controller is not available) (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Number of previous logons to cache (in case domain controller is not available) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Interactive logon Number of previous logons to cache (in case domain controller is not available) security policy setting.
 ms.assetid: 660e925e-cc3e-4098-a41e-eb8db8062d8d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Interactive logon: Number of previous logons to cache (in case domain controller is not available)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md b/windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md
index 08ab558039..55d44d3f87 100644
--- a/windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md
+++ b/windows/keep-secure/interactive-logon-prompt-user-to-change-password-before-expiration.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Prompt user to change password before expiration (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Prompt user to change password before expiration security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Interactive logon Prompt user to change password before expiration security policy setting.
 ms.assetid: 8fe94781-40f7-4fbe-8cfd-5e116e6833e9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Interactive logon: Prompt user to change password before expiration** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md b/windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
index 3d576141c7..dce10aaa6d 100644
--- a/windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
+++ b/windows/keep-secure/interactive-logon-require-domain-controller-authentication-to-unlock-workstation.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Require Domain Controller authentication to unlock workstation (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Require Domain Controller authentication to unlock workstation security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Interactive logon Require Domain Controller authentication to unlock workstation security policy setting.
 ms.assetid: 97618ed3-e946-47db-a212-b5e7a4fc6ffc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Interactive logon: Require Domain Controller authentication to unlock workstation** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-require-smart-card.md b/windows/keep-secure/interactive-logon-require-smart-card.md
index 128ca369c9..275ffa00b6 100644
--- a/windows/keep-secure/interactive-logon-require-smart-card.md
+++ b/windows/keep-secure/interactive-logon-require-smart-card.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Require smart card (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Require smart card security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Interactive logon Require smart card security policy setting.
 ms.assetid: c6a8c040-cbc7-472d-8bc5-579ddf3cbd6c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Interactive logon: Require smart card** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/interactive-logon-smart-card-removal-behavior.md b/windows/keep-secure/interactive-logon-smart-card-removal-behavior.md
index f7beddb56c..59ca4aad03 100644
--- a/windows/keep-secure/interactive-logon-smart-card-removal-behavior.md
+++ b/windows/keep-secure/interactive-logon-smart-card-removal-behavior.md
@@ -1,7 +1,6 @@
 ---
 title: Interactive logon Smart card removal behavior (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Interactive logon Smart card removal behavior security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Interactive logon Smart card removal behavior security policy setting.
 ms.assetid: 61487820-9d49-4979-b15d-c7e735999460
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Interactive logon: Smart card removal behavior** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/kerberos-policy.md b/windows/keep-secure/kerberos-policy.md
index 1227a17869..7462552b9e 100644
--- a/windows/keep-secure/kerberos-policy.md
+++ b/windows/keep-secure/kerberos-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Kerberos Policy (Windows 10)
 description: Describes the Kerberos Policy settings and provides links to policy setting descriptions.
-MSHAttr: PreferredLib /library
 ms.assetid: 94017dd9-b1a3-4624-af9f-b29161b4bf38
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/load-and-unload-device-drivers.md b/windows/keep-secure/load-and-unload-device-drivers.md
index 5cd7f9f099..b76083e989 100644
--- a/windows/keep-secure/load-and-unload-device-drivers.md
+++ b/windows/keep-secure/load-and-unload-device-drivers.md
@@ -1,7 +1,6 @@
 ---
 title: Load and unload device drivers (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Load and unload device drivers security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Load and unload device drivers security policy setting.
 ms.assetid: 66262532-c610-470c-9792-35ff4389430f
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Load and unload device drivers** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/lock-pages-in-memory.md b/windows/keep-secure/lock-pages-in-memory.md
index 2474259831..6454978bd9 100644
--- a/windows/keep-secure/lock-pages-in-memory.md
+++ b/windows/keep-secure/lock-pages-in-memory.md
@@ -1,7 +1,6 @@
 ---
 title: Lock pages in memory (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Lock pages in memory security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Lock pages in memory security policy setting.
 ms.assetid: cc724979-aec0-496d-be4e-7009aef660a3
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Lock pages in memory** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/log-on-as-a-batch-job.md b/windows/keep-secure/log-on-as-a-batch-job.md
index 3c39adb400..d2a27b6c9c 100644
--- a/windows/keep-secure/log-on-as-a-batch-job.md
+++ b/windows/keep-secure/log-on-as-a-batch-job.md
@@ -1,7 +1,6 @@
 ---
 title: Log on as a batch job (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Log on as a batch job security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Log on as a batch job security policy setting.
 ms.assetid: 4eaddb51-0a18-470e-9d3d-5e7cd7970b41
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Log on as a batch job** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/log-on-as-a-service.md b/windows/keep-secure/log-on-as-a-service.md
index 8e8e453eec..ad2eda2c3f 100644
--- a/windows/keep-secure/log-on-as-a-service.md
+++ b/windows/keep-secure/log-on-as-a-service.md
@@ -1,7 +1,6 @@
 ---
 title: Log on as a service (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Log on as a service security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Log on as a service security policy setting.
 ms.assetid: acc9a9e0-fd88-4cda-ab54-503120ba1f42
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Log on as a service** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/maintain-applocker-policies.md b/windows/keep-secure/maintain-applocker-policies.md
index bb4c95a1fe..edc7834283 100644
--- a/windows/keep-secure/maintain-applocker-policies.md
+++ b/windows/keep-secure/maintain-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Maintain AppLocker policies (Windows 10)
 description: This topic describes how to maintain rules within AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: b4fbfdfe-ef3d-49e0-a390-f2dfe74602bc
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/manage-auditing-and-security-log.md b/windows/keep-secure/manage-auditing-and-security-log.md
index 98832c3217..8eb5c90fc8 100644
--- a/windows/keep-secure/manage-auditing-and-security-log.md
+++ b/windows/keep-secure/manage-auditing-and-security-log.md
@@ -1,7 +1,6 @@
 ---
 title: Manage auditing and security log (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Manage auditing and security log security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Manage auditing and security log security policy setting.
 ms.assetid: 4b946c0d-f904-43db-b2d5-7f0917575347
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Manage auditing and security log** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md b/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
index f8af71e182..bc3ecb242b 100644
--- a/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
+++ b/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
@@ -1,7 +1,6 @@
 ---
 title: Manage identity verification using Microsoft Passport (Windows 10)
-description: In Windows 10 Microsoft Passport 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 Windows Hello (biometric) or PIN.
-MSHAttr: PreferredLib /library
+description: In Windows 10, Microsoft Passport 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 Windows Hello (biometric) or PIN.
 ms.assetid: 5BF09642-8CF5-4FBC-AC9A-5CA51E19387E
 keywords: ["identity", "PIN", "biometric", "Hello"]
 ms.prod: W10
@@ -18,14 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Benefits of Microsoft Passport](#benefits-of-microsoft-passport)
--   [How Microsoft Passport works: key points](#how-microsoft-passport-works--key-points)
--   [Comparing key-based and certificate-based authentication](#comparing-key-based-and-certificate-based-authentication)
--   [Learn more](#learn-more)
--   [Related topics](#related-topics)
-
 In Windows 10, Microsoft Passport 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 Windows Hello (biometric) or PIN.
 
 Passport addresses the following problems with passwords:
@@ -135,7 +126,7 @@ When identity providers such as Active Directory or Azure AD enroll a certificat
 
 [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md)
 
-[Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+[Event ID 300 - Passport successfully created](passport-event-300.md)
 
  
 
diff --git a/windows/keep-secure/manage-packaged-apps-with-applocker.md b/windows/keep-secure/manage-packaged-apps-with-applocker.md
index 6b5c69984a..0db2b96b96 100644
--- a/windows/keep-secure/manage-packaged-apps-with-applocker.md
+++ b/windows/keep-secure/manage-packaged-apps-with-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Manage packaged apps with AppLocker (Windows 10)
 description: This topic for IT professionals describes concepts and lists procedures to help you manage Packaged apps with AppLocker as part of your overall application control strategy.
-MSHAttr: PreferredLib /library
 ms.assetid: 6d0c99e7-0284-4547-a30a-0685a9916650
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/manage-tpm-commands.md b/windows/keep-secure/manage-tpm-commands.md
index cdb5aecc8d..d833568317 100644
--- a/windows/keep-secure/manage-tpm-commands.md
+++ b/windows/keep-secure/manage-tpm-commands.md
@@ -1,7 +1,6 @@
 ---
 title: Manage TPM commands (Windows 10)
 description: This topic for the IT professional describes how to manage which Trusted Platform Module (TPM) commands are available to domain users and to local users.
-MSHAttr: PreferredLib /library
 ms.assetid: a78e751a-2806-43ae-9c20-2e7ca466b765
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/manage-tpm-lockout.md b/windows/keep-secure/manage-tpm-lockout.md
index 868a1ea58f..cd4748f94d 100644
--- a/windows/keep-secure/manage-tpm-lockout.md
+++ b/windows/keep-secure/manage-tpm-lockout.md
@@ -1,7 +1,6 @@
 ---
 title: Manage TPM lockout (Windows 10)
 description: This topic for the IT professional describes how to manage the lockout feature for the Trusted Platform Module (TPM) in Windows.
-MSHAttr: PreferredLib /library
 ms.assetid: bf27adbe-404c-4691-a644-29ec722a3f7b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/maximum-lifetime-for-service-ticket.md b/windows/keep-secure/maximum-lifetime-for-service-ticket.md
index 9d48d59c9c..d1ddb01b51 100644
--- a/windows/keep-secure/maximum-lifetime-for-service-ticket.md
+++ b/windows/keep-secure/maximum-lifetime-for-service-ticket.md
@@ -1,7 +1,6 @@
 ---
 title: Maximum lifetime for service ticket (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Maximum lifetime for service ticket security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Maximum lifetime for service ticket security policy setting.
 ms.assetid: 484bf05a-3858-47fc-bc02-6599ca860247
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Maximum lifetime for service ticket** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md b/windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md
index 43c70870c2..2a1b0a18e3 100644
--- a/windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md
+++ b/windows/keep-secure/maximum-lifetime-for-user-ticket-renewal.md
@@ -1,7 +1,6 @@
 ---
 title: Maximum lifetime for user ticket renewal (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Maximum lifetime for user ticket renewal security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Maximum lifetime for user ticket renewal security policy setting.
 ms.assetid: f88cd819-3dd1-4e38-b560-13fe6881b609
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Maximum lifetime for user ticket renewal** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/maximum-lifetime-for-user-ticket.md b/windows/keep-secure/maximum-lifetime-for-user-ticket.md
index 1e8d285938..7301401239 100644
--- a/windows/keep-secure/maximum-lifetime-for-user-ticket.md
+++ b/windows/keep-secure/maximum-lifetime-for-user-ticket.md
@@ -1,7 +1,6 @@
 ---
 title: Maximum lifetime for user ticket (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Maximum lifetime for user ticket policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Maximum lifetime for user ticket policy setting.
 ms.assetid: bcb4ff59-334d-4c2f-99af-eca2b64011dc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Maximum lifetime for user ticket** policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/maximum-password-age.md b/windows/keep-secure/maximum-password-age.md
index 5333cbf388..b80a337270 100644
--- a/windows/keep-secure/maximum-password-age.md
+++ b/windows/keep-secure/maximum-password-age.md
@@ -1,7 +1,6 @@
 ---
 title: Maximum password age (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Maximum password age security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Maximum password age security policy setting.
 ms.assetid: 2d6e70e7-c8b0-44fb-8113-870c6120871d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Maximum password age** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md b/windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md
index 2e559d422e..9fc39fe52d 100644
--- a/windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md
+++ b/windows/keep-secure/maximum-tolerance-for-computer-clock-synchronization.md
@@ -1,7 +1,6 @@
 ---
 title: Maximum tolerance for computer clock synchronization (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Maximum tolerance for computer clock synchronization security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Maximum tolerance for computer clock synchronization security policy setting.
 ms.assetid: ba2cf59e-d69d-469e-95e3-8e6a0ba643af
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Maximum tolerance for computer clock synchronization** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/merge-applocker-policies-by-using-set-applockerpolicy.md b/windows/keep-secure/merge-applocker-policies-by-using-set-applockerpolicy.md
index a6a63192e3..746254c18e 100644
--- a/windows/keep-secure/merge-applocker-policies-by-using-set-applockerpolicy.md
+++ b/windows/keep-secure/merge-applocker-policies-by-using-set-applockerpolicy.md
@@ -1,7 +1,6 @@
 ---
-title: Merge AppLocker policies by using Set ApplockerPolicy (Windows 10)
+title: Merge AppLocker policies by using Set-ApplockerPolicy (Windows 10)
 description: This topic for IT professionals describes the steps to merge AppLocker policies by using Windows PowerShell.
-MSHAttr: PreferredLib /library
 ms.assetid: f1c7d5c0-463e-4fe2-a410-844a404f18d0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/merge-applocker-policies-manually.md b/windows/keep-secure/merge-applocker-policies-manually.md
index e86a677597..dc7b2e2f7c 100644
--- a/windows/keep-secure/merge-applocker-policies-manually.md
+++ b/windows/keep-secure/merge-applocker-policies-manually.md
@@ -1,7 +1,6 @@
 ---
 title: Merge AppLocker policies manually (Windows 10)
 description: This topic for IT professionals describes the steps to manually merge AppLocker policies to update the Group Policy Object (GPO).
-MSHAttr: PreferredLib /library
 ms.assetid: 3605f293-e5f2-481d-8efd-775f9f23c30f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/microsoft-network-client-digitally-sign-communications--always.md b/windows/keep-secure/microsoft-network-client-digitally-sign-communications--always.md
index 25ef1e3f33..989b9a6a0d 100644
--- a/windows/keep-secure/microsoft-network-client-digitally-sign-communications--always.md
+++ b/windows/keep-secure/microsoft-network-client-digitally-sign-communications--always.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network client Digitally sign communications (always) (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Microsoft network client Digitally sign communications (always) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Microsoft network client Digitally sign communications (always) security policy setting.
 ms.assetid: 4b7b0298-b130-40f8-960d-60418ba85f76
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Microsoft network client: Digitally sign communications (always)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-client-digitally-sign-communications--if-server-agrees.md b/windows/keep-secure/microsoft-network-client-digitally-sign-communications--if-server-agrees.md
index 5a1d887ba0..e4be762172 100644
--- a/windows/keep-secure/microsoft-network-client-digitally-sign-communications--if-server-agrees.md
+++ b/windows/keep-secure/microsoft-network-client-digitally-sign-communications--if-server-agrees.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network client Digitally sign communications (if server agrees) (Windows 10)
-description: Describes the best practices location values and security considerations for the Microsoft network client Digitally sign communications (if server agrees) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Microsoft network client Digitally sign communications (if server agrees) security policy setting.
 ms.assetid: e553f700-aae5-425c-8650-f251c90ba5dd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Microsoft network client: Digitally sign communications (if server agrees)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md b/windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
index 23d3cb1c64..d65dfe9610 100644
--- a/windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
+++ b/windows/keep-secure/microsoft-network-client-send-unencrypted-password-to-third-party-smb-servers.md
@@ -1,7 +1,6 @@
 ---
-title: Microsoft network client Send unencrypted password to third party SMB servers (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Microsoft network client Send unencrypted password to third party SMB servers security policy setting.
-MSHAttr: PreferredLib /library
+title: Microsoft network client Send unencrypted password to third-party SMB servers (Windows 10)
+description: Describes the best practices, location, values, policy management and security considerations for the Microsoft network client Send unencrypted password to third-party SMB servers security policy setting.
 ms.assetid: 97a76b93-afa7-4dd9-bb52-7c9e289b6017
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Microsoft network client: Send unencrypted password to third-party SMB servers** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md b/windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
index 18e2420f90..4b1e5d32b1 100644
--- a/windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
+++ b/windows/keep-secure/microsoft-network-server-amount-of-idle-time-required-before-suspending-session.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Amount of idle time required before suspending session (Windows 10)
-description: Describes the best practices location values and security considerations for the Microsoft network server Amount of idle time required before suspending session security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Microsoft network server Amount of idle time required before suspending session security policy setting.
 ms.assetid: 8227842a-569d-480f-b43c-43450bbaa722
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Microsoft network server: Amount of idle time required before suspending session** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md b/windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
index 16a1b046ed..ce20b1229e 100644
--- a/windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
+++ b/windows/keep-secure/microsoft-network-server-attempt-s4u2self-to-obtain-claim-information.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Attempt S4U2Self to obtain claim information (Windows 10)
-description: Describes the best practices location values management and security considerations for the Microsoft network server Attempt S4U2Self to obtain claim information security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management, and security considerations for the Microsoft network server Attempt S4U2Self to obtain claim information security policy setting.
 ms.assetid: e4508387-35ed-4a3f-a47c-27f8396adbba
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management, and security considerations for the **Microsoft network server: Attempt S4U2Self to obtain claim information** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-digitally-sign-communications--always.md b/windows/keep-secure/microsoft-network-server-digitally-sign-communications--always.md
index ea4900c8ea..8b44bbff56 100644
--- a/windows/keep-secure/microsoft-network-server-digitally-sign-communications--always.md
+++ b/windows/keep-secure/microsoft-network-server-digitally-sign-communications--always.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Digitally sign communications (always) (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Microsoft network server Digitally sign communications (always) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Microsoft network server Digitally sign communications (always) security policy setting.
 ms.assetid: 2007b622-7bc2-44e8-9cf1-d34b62117ea8
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Microsoft network server: Digitally sign communications (always)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-digitally-sign-communications--if-client-agrees.md b/windows/keep-secure/microsoft-network-server-digitally-sign-communications--if-client-agrees.md
index 883f184874..6d9c850f06 100644
--- a/windows/keep-secure/microsoft-network-server-digitally-sign-communications--if-client-agrees.md
+++ b/windows/keep-secure/microsoft-network-server-digitally-sign-communications--if-client-agrees.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Digitally sign communications (if client agrees) (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Microsoft network server Digitally sign communications (if client agrees) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Microsoft network server Digitally sign communications (if client agrees) security policy setting.
 ms.assetid: c92b2e3d-1dbf-4337-a145-b17a585f4fc1
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Microsoft network server: Digitally sign communications (if client agrees)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md b/windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
index ad498a6bc4..18b1bba108 100644
--- a/windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
+++ b/windows/keep-secure/microsoft-network-server-disconnect-clients-when-logon-hours-expire.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Disconnect clients when logon hours expire (Windows 10)
-description: Describes the best practices location values and security considerations for the Microsoft network server Disconnect clients when logon hours expire security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Microsoft network server Disconnect clients when logon hours expire security policy setting.
 ms.assetid: 48b5c424-9ba8-416d-be7d-ccaabb3f49af
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Microsoft network server: Disconnect clients when logon hours expire** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md b/windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md
index 3104ce5746..b53e9c7660 100644
--- a/windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md
+++ b/windows/keep-secure/microsoft-network-server-server-spn-target-name-validation-level.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft network server Server SPN target name validation level (Windows 10)
-description: Describes the best practices location and values policy management and security considerations for the Microsoft network server Server SPN target name validation level security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, and values, policy management and security considerations for the Microsoft network server Server SPN target name validation level security policy setting.
 ms.assetid: 18337f78-eb45-42fd-bdbd-f8cd02c3e154
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, and values, policy management and security considerations for the **Microsoft network server: Server SPN target name validation level** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/microsoft-passport-and-password-changes.md b/windows/keep-secure/microsoft-passport-and-password-changes.md
index 3b645dedbd..44ad7763a5 100644
--- a/windows/keep-secure/microsoft-passport-and-password-changes.md
+++ b/windows/keep-secure/microsoft-passport-and-password-changes.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Passport and password changes (Windows 10)
-description: When you set up Microsoft Passport the PIN or biometric (Windows Hello) gesture that you use is specific to that device.
-MSHAttr: PreferredLib /library
+description: When you set up Microsoft Passport, the PIN or biometric (Windows Hello) gesture that you use is specific to that device.
 ms.assetid: 83005FE4-8899-47A6-BEA9-C17CCA0B6B55
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -61,7 +60,7 @@ This example also applies to an Active Directory account when [Passport for Work
 
 [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md)
 
-[Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+[Event ID 300 - Passport successfully created](passport-event-300.md)
 
  
 
diff --git a/windows/keep-secure/microsoft-passport-errors-during-pin-creation.md b/windows/keep-secure/microsoft-passport-errors-during-pin-creation.md
index 4af09f299c..1303dda80d 100644
--- a/windows/keep-secure/microsoft-passport-errors-during-pin-creation.md
+++ b/windows/keep-secure/microsoft-passport-errors-during-pin-creation.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Passport errors during PIN creation (Windows 10)
-description: When you set up Microsoft Passport in Windows 10 you may get an error during the Create a work PIN step.
-MSHAttr: PreferredLib /library
+description: When you set up Microsoft Passport in Windows 10, you may get an error during the Create a work PIN step.
 ms.assetid: DFEFE22C-4FEF-4FD9-BFC4-9B419C339502
 keywords: ["PIN", "error", "create a work PIN"]
 ms.prod: W10
@@ -18,13 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Where is the error code?](#where-is-the-error-code-)
--   [Error mitigations](#error-mitigations)
--   [Errors with unknown mitigation](#errors-with-unknown-mitigation)
--   [Related topics](#related-topics)
-
 When you set up Microsoft Passport in Windows 10, you may get an error during the **Create a work PIN** step. This topic lists some of the error codes with recommendations for mitigating the problem. If you get an error code that is not listed here, contact Microsoft Support.
 
 ## Where is the error code?
@@ -255,7 +247,7 @@ For errors listed in this table, contact Microsoft Support for assistance.
 
 [Microsoft Passport and password changes](microsoft-passport-and-password-changes.md)
 
-[Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+[Event ID 300 - Passport successfully created](passport-event-300.md)
 
  
 
diff --git a/windows/keep-secure/microsoft-passport-guide.md b/windows/keep-secure/microsoft-passport-guide.md
index 6305966453..54e24297a3 100644
--- a/windows/keep-secure/microsoft-passport-guide.md
+++ b/windows/keep-secure/microsoft-passport-guide.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Passport guide (Windows 10)
 description: This guide describes the new Windows Hello and Microsoft Passport technologies that are part of the Windows 10 operating system.
-MSHAttr: PreferredLib /library
 ms.assetid: 11EA7826-DA6B-4E5C-99FB-142CC6BD9E84
 keywords: ["security", "credential", "password", "authentication"]
 ms.prod: W10
@@ -17,17 +16,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Problems with traditional credentials](#problems-with-traditional-credentials)
--   [Solve credential problems](#solve-credential-problems)
--   [What is Windows Hello?](#what-is-windows-hello-)
--   [What is Microsoft Passport?](#what-is-microsoft-passport-)
--   [How Microsoft Passport works](#how-microsoft-passport-works)
--   [Design a Microsoft Passport for Work deployment](#design)
--   [Implement Microsoft Passport](#implement-microsoft-passport)
--   [Roadmap](#roadmap)
-
 This guide describes the new Windows Hello and Microsoft Passport technologies that are part of the Windows 10 operating system. It highlights specific capabilities of these technologies that help mitigate threats from conventional credentials and provides guidance about how to design and deploy these technologies as part of your Windows 10 rollout.
 
 A fundamental assumption about information security is that a system can identify who’s using it. In identifying a user, the system can decide whether the user has identified himself or herself appropriately (a process known as authentication), and then determine what that properly authenticated user should be able to do (a process known as authorization). The overwhelming majority of computer systems deployed throughout the world depend on user credentials as a means of making authentication and authorization decisions, and that means that these systems depend on reusable, user-created passwords for their security. The oft-cited maxim that authentication can involve “something you know, something you have, or something you are” neatly highlights the issue: a reusable password is an authentication factor all by itself, so anyone who knows the password can impersonate the user who owns it.
diff --git a/windows/keep-secure/minimum-password-age.md b/windows/keep-secure/minimum-password-age.md
index 4acfbb54c9..e3b03a77c1 100644
--- a/windows/keep-secure/minimum-password-age.md
+++ b/windows/keep-secure/minimum-password-age.md
@@ -1,7 +1,6 @@
 ---
 title: Minimum password age (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Minimum password age security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Minimum password age security policy setting.
 ms.assetid: 91915cb2-1b3f-4fb7-afa0-d03df95e8161
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Minimum password age** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/minimum-password-length.md b/windows/keep-secure/minimum-password-length.md
index d2516151ef..903f9b16ae 100644
--- a/windows/keep-secure/minimum-password-length.md
+++ b/windows/keep-secure/minimum-password-length.md
@@ -1,7 +1,6 @@
 ---
 title: Minimum password length (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Minimum password length security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Minimum password length security policy setting.
 ms.assetid: 3d22eb9a-859a-4b6f-82f5-c270c427e17e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Minimum password length** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/modify-an-object-label.md b/windows/keep-secure/modify-an-object-label.md
index ad90944497..4fbd65119c 100644
--- a/windows/keep-secure/modify-an-object-label.md
+++ b/windows/keep-secure/modify-an-object-label.md
@@ -1,7 +1,6 @@
 ---
 title: Modify an object label (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Modify an object label security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Modify an object label security policy setting.
 ms.assetid: 3e5a97dd-d363-43a8-ae80-452e866ebfd5
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Modify an object label** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/modify-firmware-environment-values.md b/windows/keep-secure/modify-firmware-environment-values.md
index 3376c47e9c..b3679b1056 100644
--- a/windows/keep-secure/modify-firmware-environment-values.md
+++ b/windows/keep-secure/modify-firmware-environment-values.md
@@ -1,7 +1,6 @@
 ---
 title: Modify firmware environment values (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Modify firmware environment values security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Modify firmware environment values security policy setting.
 ms.assetid: 80bad5c4-d9eb-4e3a-a5dc-dcb742b83fca
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Modify firmware environment values** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/monitor-application-usage-with-applocker.md b/windows/keep-secure/monitor-application-usage-with-applocker.md
index 50782a354c..f1dfd53488 100644
--- a/windows/keep-secure/monitor-application-usage-with-applocker.md
+++ b/windows/keep-secure/monitor-application-usage-with-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor app usage with AppLocker (Windows 10)
 description: This topic for IT professionals describes how to monitor app usage when AppLocker policies are applied.
-MSHAttr: PreferredLib /library
 ms.assetid: 0516da6e-ebe4-45b4-a97b-31daba96d1cf
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-central-access-policy-and-rule-definitions.md b/windows/keep-secure/monitor-central-access-policy-and-rule-definitions.md
index 7c87aa5151..b8e3992188 100644
--- a/windows/keep-secure/monitor-central-access-policy-and-rule-definitions.md
+++ b/windows/keep-secure/monitor-central-access-policy-and-rule-definitions.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor central access policy and rule definitions (Windows 10)
 description: This topic for the IT professional describes how to monitor changes to central access policy and central access rule definitions when you use advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: 553f98a6-7606-4518-a3c5-347a33105130
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-claim-types.md b/windows/keep-secure/monitor-claim-types.md
index a8914faa5c..67265eeab9 100644
--- a/windows/keep-secure/monitor-claim-types.md
+++ b/windows/keep-secure/monitor-claim-types.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor claim types (Windows 10)
 description: This topic for the IT professional describes how to monitor changes to claim types that are associated with dynamic access control when you are using advanced security auditing options.
-MSHAttr: PreferredLib /library
 ms.assetid: 426084da-4eef-44af-aeec-e7ab4d4e2439
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-resource-attribute-definitions.md b/windows/keep-secure/monitor-resource-attribute-definitions.md
index 06058ddc1e..2412bd06b9 100644
--- a/windows/keep-secure/monitor-resource-attribute-definitions.md
+++ b/windows/keep-secure/monitor-resource-attribute-definitions.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor resource attribute definitions (Windows 10)
 description: This topic for the IT professional describes how to monitor changes to resource attribute definitions when you are using advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: aace34b0-123a-4b83-9e09-f269220e79de
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-the-central-access-policies-associated-with-files-and-folders.md b/windows/keep-secure/monitor-the-central-access-policies-associated-with-files-and-folders.md
index d3b830a6b7..322fd4217e 100644
--- a/windows/keep-secure/monitor-the-central-access-policies-associated-with-files-and-folders.md
+++ b/windows/keep-secure/monitor-the-central-access-policies-associated-with-files-and-folders.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor the central access policies associated with files and folders (Windows 10)
 description: This topic for the IT professional describes how to monitor changes to the central access policies that are associated with files and folders when you are using advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: 2ea8fc23-b3ac-432f-87b0-6a16506e8eed
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-the-central-access-policies-that-apply-on-a-file-server.md b/windows/keep-secure/monitor-the-central-access-policies-that-apply-on-a-file-server.md
index c3af340d1b..d19126daa6 100644
--- a/windows/keep-secure/monitor-the-central-access-policies-that-apply-on-a-file-server.md
+++ b/windows/keep-secure/monitor-the-central-access-policies-that-apply-on-a-file-server.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor the central access policies that apply on a file server (Windows 10)
 description: This topic for the IT professional describes how to monitor changes to the central access policies that apply to a file server when using advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: 126b051e-c20d-41f1-b42f-6cff24dcf20c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-the-resource-attributes-on-files-and-folders.md b/windows/keep-secure/monitor-the-resource-attributes-on-files-and-folders.md
index 0991097297..0e52151278 100644
--- a/windows/keep-secure/monitor-the-resource-attributes-on-files-and-folders.md
+++ b/windows/keep-secure/monitor-the-resource-attributes-on-files-and-folders.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor the resource attributes on files and folders (Windows 10)
 description: This topic for the IT professional describes how to monitor attempts to change settings to the resource attributes on files when you are using advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: 4944097b-320f-44c7-88ed-bf55946a358b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-the-use-of-removable-storage-devices.md b/windows/keep-secure/monitor-the-use-of-removable-storage-devices.md
index 2dfa379b7e..4a241ac162 100644
--- a/windows/keep-secure/monitor-the-use-of-removable-storage-devices.md
+++ b/windows/keep-secure/monitor-the-use-of-removable-storage-devices.md
@@ -1,7 +1,6 @@
 ---
 title: Monitor the use of removable storage devices (Windows 10)
 description: This topic for the IT professional describes how to monitor attempts to use removable storage devices to access network resources. It describes how to use advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: b0a9e4a5-b7ff-41c6-96ff-0228d4ba5da8
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/monitor-user-and-device-claims-during-sign-in.md b/windows/keep-secure/monitor-user-and-device-claims-during-sign-in.md
index 7dd4fcaa94..cee27df860 100644
--- a/windows/keep-secure/monitor-user-and-device-claims-during-sign-in.md
+++ b/windows/keep-secure/monitor-user-and-device-claims-during-sign-in.md
@@ -1,7 +1,6 @@
 ---
-title: Monitor user and device claims during sign in (Windows 10)
+title: Monitor user and device claims during sign-in (Windows 10)
 description: This topic for the IT professional describes how to monitor user and device claims that are associated with a user’s security token when you are using advanced security auditing options to monitor dynamic access control objects.
-MSHAttr: PreferredLib /library
 ms.assetid: 71796ea9-5fe4-4183-8475-805c3c1f319f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/network-access-allow-anonymous-sidname-translation.md b/windows/keep-secure/network-access-allow-anonymous-sidname-translation.md
index 3516e8adfc..286cf227fe 100644
--- a/windows/keep-secure/network-access-allow-anonymous-sidname-translation.md
+++ b/windows/keep-secure/network-access-allow-anonymous-sidname-translation.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Allow anonymous SID/Name translation (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Allow anonymous SID/Name translation security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Allow anonymous SID/Name translation security policy setting.
 ms.assetid: 0144477f-22a6-4d06-b70a-9c9c2196e99e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Allow anonymous SID/Name translation** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md b/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
index fae61f7f83..9b2363c07f 100644
--- a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
+++ b/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts-and-shares.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Do not allow anonymous enumeration of SAM accounts and shares (Windows 10)
-description: Describes the best practices location values and security considerations for the Network access Do not allow anonymous enumeration of SAM accounts and shares security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Network access Do not allow anonymous enumeration of SAM accounts and shares security policy setting.
 ms.assetid: 3686788d-4cc7-4222-9163-cbc7c3362d73
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Network access: Do not allow anonymous enumeration of SAM accounts and shares** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md b/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
index 51f0f9ed6f..70eb372dcb 100644
--- a/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
+++ b/windows/keep-secure/network-access-do-not-allow-anonymous-enumeration-of-sam-accounts.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Do not allow anonymous enumeration of SAM accounts (Windows 10)
-description: Describes the best practices location values and security considerations for the Network access Do not allow anonymous enumeration of SAM accounts security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Network access Do not allow anonymous enumeration of SAM accounts security policy setting.
 ms.assetid: 6ee25b33-ad43-4097-b031-7be680f64c7c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Network access: Do not allow anonymous enumeration of SAM accounts** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md b/windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
index 869ba9fb3f..6fd38c9352 100644
--- a/windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
+++ b/windows/keep-secure/network-access-do-not-allow-storage-of-passwords-and-credentials-for-network-authentication.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Do not allow storage of passwords and credentials for network authentication (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Do not allow storage of passwords and credentials for network authentication security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Do not allow storage of passwords and credentials for network authentication security policy setting.
 ms.assetid: b9b64360-36ea-40fa-b795-2d6558c46563
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Do not allow storage of passwords and credentials for network authentication** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md b/windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md
index a6cbb46cd1..a1cbd0efd4 100644
--- a/windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md
+++ b/windows/keep-secure/network-access-let-everyone-permissions-apply-to-anonymous-users.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Let Everyone permissions apply to anonymous users (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Let Everyone permissions apply to anonymous users security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Let Everyone permissions apply to anonymous users security policy setting.
 ms.assetid: cdbc5159-9173-497e-b46b-7325f4256353
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Let Everyone permissions apply to anonymous users** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md b/windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md
index 47c7dffa84..3d5c222290 100644
--- a/windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md
+++ b/windows/keep-secure/network-access-named-pipes-that-can-be-accessed-anonymously.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Named Pipes that can be accessed anonymously (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Named Pipes that can be accessed anonymously security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Named Pipes that can be accessed anonymously security policy setting.
 ms.assetid: 8897d2a4-813e-4d2b-8518-fcee71e1cf2c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Named Pipes that can be accessed anonymously** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md b/windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md
index f2a0bc075e..b38246a85a 100644
--- a/windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md
+++ b/windows/keep-secure/network-access-remotely-accessible-registry-paths-and-subpaths.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Remotely accessible registry paths and subpaths (Windows 10)
-description: Describes the best practices location values and security considerations for the Network access Remotely accessible registry paths and subpaths security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Network access Remotely accessible registry paths and subpaths security policy setting.
 ms.assetid: 3fcbbf70-a002-4f85-8e86-8dabad21928e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Network access: Remotely accessible registry paths and subpaths** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-remotely-accessible-registry-paths.md b/windows/keep-secure/network-access-remotely-accessible-registry-paths.md
index 4058d26865..dbc8008031 100644
--- a/windows/keep-secure/network-access-remotely-accessible-registry-paths.md
+++ b/windows/keep-secure/network-access-remotely-accessible-registry-paths.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Remotely accessible registry paths (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Remotely accessible registry paths security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Remotely accessible registry paths security policy setting.
 ms.assetid: 977f86ea-864f-4f1b-9756-22220efce0bd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Remotely accessible registry paths** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md b/windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
index c8cf063f39..baaacfe3a8 100644
--- a/windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
+++ b/windows/keep-secure/network-access-restrict-anonymous-access-to-named-pipes-and-shares.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Restrict anonymous access to Named Pipes and Shares (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Restrict anonymous access to Named Pipes and Shares security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Restrict anonymous access to Named Pipes and Shares security policy setting.
 ms.assetid: e66cd708-7322-4d49-9b57-1bf8ec7a4c10
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Restrict anonymous access to Named Pipes and Shares** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md b/windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md
index 82f4edf7a5..14290aa358 100644
--- a/windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md
+++ b/windows/keep-secure/network-access-shares-that-can-be-accessed-anonymously.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Shares that can be accessed anonymously (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Shares that can be accessed anonymously security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Shares that can be accessed anonymously security policy setting.
 ms.assetid: f3e4b919-8279-4972-b415-5f815e2f0a1a
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Shares that can be accessed anonymously** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md b/windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md
index a5918b4814..e76dbe2316 100644
--- a/windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md
+++ b/windows/keep-secure/network-access-sharing-and-security-model-for-local-accounts.md
@@ -1,7 +1,6 @@
 ---
 title: Network access Sharing and security model for local accounts (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network access Sharing and security model for local accounts security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network access Sharing and security model for local accounts security policy setting.
 ms.assetid: 0b3d703c-ea27-488f-8f59-b345af75b994
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network access: Sharing and security model for local accounts** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-list-manager-policies.md b/windows/keep-secure/network-list-manager-policies.md
index cf70cfbda0..82b2e0ecd4 100644
--- a/windows/keep-secure/network-list-manager-policies.md
+++ b/windows/keep-secure/network-list-manager-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Network List Manager policies (Windows 10)
 description: Network List Manager policies are security settings that you can use to configure different aspects of how networks are listed and displayed on one device or on many devices.
-MSHAttr: PreferredLib /library
 ms.assetid: bd8109d4-b07c-4beb-a9a6-affae2ba2fda
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md b/windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
index d4675ae8e9..3933e3f9ff 100644
--- a/windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
+++ b/windows/keep-secure/network-security-allow-local-system-to-use-computer-identity-for-ntlm.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Allow Local System to use computer identity for NTLM (Windows 10)
-description: Describes the location values policy management and security considerations for the Network security Allow Local System to use computer identity for NTLM security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the location, values, policy management, and security considerations for the Network security Allow Local System to use computer identity for NTLM security policy setting.
 ms.assetid: c46a658d-b7a4-4139-b7ea-b9268c240053
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the location, values, policy management, and security considerations for the **Network security: Allow Local System to use computer identity for NTLM** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md b/windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md
index dd199cef5c..ca4c87257c 100644
--- a/windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md
+++ b/windows/keep-secure/network-security-allow-localsystem-null-session-fallback.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Allow LocalSystem NULL session fallback (Windows 10)
-description: Describes the best practices location values and security considerations for the Network security Allow LocalSystem NULL session fallback security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Network security Allow LocalSystem NULL session fallback security policy setting.
 ms.assetid: 5b72edaa-bec7-4572-b6f0-648fc38f5395
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Network security: Allow LocalSystem NULL session fallback** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md b/windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
index a3af882c1a..7072c876dd 100644
--- a/windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
+++ b/windows/keep-secure/network-security-allow-pku2u-authentication-requests-to-this-computer-to-use-online-identities.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Allow PKU2U authentication requests to this computer to use online identities (Windows 10)
-description: Describes the best practices location and values for the Network Security Allow PKU2U authentication requests to this computer to use online identities security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, and values for the Network Security Allow PKU2U authentication requests to this computer to use online identities security policy setting.
 ms.assetid: e04a854e-d94d-4306-9fb3-56e9bd7bb926
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, and values for the **Network Security: Allow PKU2U authentication requests to this computer to use online identities** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md b/windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md
index 35fda6aa8c..981f5cdd24 100644
--- a/windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md
+++ b/windows/keep-secure/network-security-configure-encryption-types-allowed-for-kerberos.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Configure encryption types allowed for Kerberos Win7 only (Windows 10)
-description: Describes the best practices location values and security considerations for the Network security Configure encryption types allowed for Kerberos Win7 only security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values and security considerations for the Network security Configure encryption types allowed for Kerberos Win7 only security policy setting.
 ms.assetid: 303d32cc-415b-44ba-96c0-133934046ece
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values and security considerations for the **Network security: Configure encryption types allowed for Kerberos Win7 only** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md b/windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
index 5a3f16a82c..2585a9b1fe 100644
--- a/windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
+++ b/windows/keep-secure/network-security-do-not-store-lan-manager-hash-value-on-next-password-change.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Do not store LAN Manager hash value on next password change (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network security Do not store LAN Manager hash value on next password change security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network security Do not store LAN Manager hash value on next password change security policy setting.
 ms.assetid: 6452b268-e5ba-4889-9d38-db28f919af51
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network security: Do not store LAN Manager hash value on next password change** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md b/windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md
index 5353fe129b..2b6ab3ada7 100644
--- a/windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md
+++ b/windows/keep-secure/network-security-force-logoff-when-logon-hours-expire.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Force logoff when logon hours expire (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network security Force logoff when logon hours expire security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network security Force logoff when logon hours expire security policy setting.
 ms.assetid: 64d5dde4-58e4-4217-b2c4-73bd554ec926
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network security: Force logoff when logon hours expire** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-lan-manager-authentication-level.md b/windows/keep-secure/network-security-lan-manager-authentication-level.md
index 67a08e2f91..5915894ae2 100644
--- a/windows/keep-secure/network-security-lan-manager-authentication-level.md
+++ b/windows/keep-secure/network-security-lan-manager-authentication-level.md
@@ -1,7 +1,6 @@
 ---
 title: Network security LAN Manager authentication level (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network security LAN Manager authentication level security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network security LAN Manager authentication level security policy setting.
 ms.assetid: bbe1a98c-420a-41e7-9d3c-3a2fe0f1843e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network security: LAN Manager authentication level** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-ldap-client-signing-requirements.md b/windows/keep-secure/network-security-ldap-client-signing-requirements.md
index 03415884c0..ed336b244a 100644
--- a/windows/keep-secure/network-security-ldap-client-signing-requirements.md
+++ b/windows/keep-secure/network-security-ldap-client-signing-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: Network security LDAP client signing requirements (Windows 10)
-description: This security policy reference topic for the IT professional describes the best practices location values policy management and security considerations for this policy setting.
-MSHAttr: PreferredLib /library
+description: This security policy reference topic for the IT professional describes the best practices, location, values, policy management and security considerations for this policy setting.
 ms.assetid: 38b35489-eb5b-4035-bc87-df63de50509c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 This security policy reference topic for the IT professional describes the best practices, location, values, policy management and security considerations for this policy setting. This information applies to computers running at least the Windows Server 2008 operating system.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--clients.md b/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--clients.md
index f8c02c7e2b..0f6aa65a9c 100644
--- a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--clients.md
+++ b/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--clients.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Minimum session security for NTLM SSP based (including secure RPC) clients (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network security Minimum session security for NTLM SSP based (including secure RPC) clients security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network security Minimum session security for NTLM SSP based (including secure RPC) clients security policy setting.
 ms.assetid: 89903de8-23d0-4e0f-9bef-c00cb7aebf00
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network security: Minimum session security for NTLM SSP based (including secure RPC) clients** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--servers.md b/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--servers.md
index badb8395c0..09698504bc 100644
--- a/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--servers.md
+++ b/windows/keep-secure/network-security-minimum-session-security-for-ntlm-ssp-based--including-secure-rpc--servers.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Minimum session security for NTLM SSP based (including secure RPC) servers (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Network security Minimum session security for NTLM SSP based (including secure RPC) servers security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Network security Minimum session security for NTLM SSP based (including secure RPC) servers security policy setting.
 ms.assetid: c6a60c1b-bc8d-4d02-9481-f847a411b4fc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Network security: Minimum session security for NTLM SSP based (including secure RPC) servers** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md b/windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
index 0a76e57cd9..cd2bf1d88c 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-add-remote-server-exceptions-for-ntlm-authentication.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Add remote server exceptions for NTLM authentication (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network security Restrict NTLM Add remote server exceptions for NTLM authentication security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network security Restrict NTLM Add remote server exceptions for NTLM authentication security policy setting.
 ms.assetid: 9b017399-0a54-4580-bfae-614c2beda3a1
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network security: Restrict NTLM: Add remote server exceptions for NTLM authentication** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md b/windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
index 10e5dfe9e7..dfb2288ae6 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-add-server-exceptions-in-this-domain.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Add server exceptions in this domain (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network security Restrict NTLM Add server exceptions in this domain security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network security Restrict NTLM Add server exceptions in this domain security policy setting.
 ms.assetid: 2f981b68-6aa7-4dd9-b53d-d88551277cc0
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network security: Restrict NTLM: Add server exceptions in this domain** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md b/windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
index 02bba24f83..f801658d52 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-audit-incoming-ntlm-traffic.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Audit incoming NTLM traffic (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network Security Restrict NTLM Audit incoming NTLM traffic security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network Security Restrict NTLM Audit incoming NTLM traffic security policy setting.
 ms.assetid: 37e380c2-22e1-44cd-9993-e12815b845cf
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network Security: Restrict NTLM: Audit incoming NTLM traffic** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md b/windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
index c7d6c4063d..e8a80b5166 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-audit-ntlm-authentication-in-this-domain.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Audit NTLM authentication in this domain (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network Security Restrict NTLM Audit NTLM authentication in this domain security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network Security Restrict NTLM Audit NTLM authentication in this domain security policy setting.
 ms.assetid: 33183ef9-53b5-4258-8605-73dc46335e6e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network Security: Restrict NTLM: Audit NTLM authentication in this domain** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md b/windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md
index d197ac9308..11866f1750 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-incoming-ntlm-traffic.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Incoming NTLM traffic (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network Security Restrict NTLM Incoming NTLM traffic security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network Security Restrict NTLM Incoming NTLM traffic security policy setting.
 ms.assetid: c0eff7d3-ed59-4004-908a-2205295fefb8
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network Security: Restrict NTLM: Incoming NTLM traffic** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md b/windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
index 6ffdacc9fc..47e59383c0 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-ntlm-authentication-in-this-domain.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM NTLM authentication in this domain (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network Security Restrict NTLM NTLM authentication in this domain security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network Security Restrict NTLM NTLM authentication in this domain security policy setting.
 ms.assetid: 4c7884e9-cc11-4402-96b6-89c77dc908f8
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network Security: Restrict NTLM: NTLM authentication in this domain** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md b/windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
index 0a937627c1..defbe6351f 100644
--- a/windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
+++ b/windows/keep-secure/network-security-restrict-ntlm-outgoing-ntlm-traffic-to-remote-servers.md
@@ -1,7 +1,6 @@
 ---
 title: Network security Restrict NTLM Outgoing NTLM traffic to remote servers (Windows 10)
-description: Describes the best practices location values management aspects and security considerations for the Network Security Restrict NTLM Outgoing NTLM traffic to remote servers security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, management aspects, and security considerations for the Network Security Restrict NTLM Outgoing NTLM traffic to remote servers security policy setting.
 ms.assetid: 63437a90-764b-4f06-aed8-a4a26cf81bd1
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, management aspects, and security considerations for the **Network Security: Restrict NTLM: Outgoing NTLM traffic to remote servers** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/optimize-applocker-performance.md b/windows/keep-secure/optimize-applocker-performance.md
index 968a88240b..87143fb82f 100644
--- a/windows/keep-secure/optimize-applocker-performance.md
+++ b/windows/keep-secure/optimize-applocker-performance.md
@@ -1,7 +1,6 @@
 ---
 title: Optimize AppLocker performance (Windows 10)
 description: This topic for IT professionals describes how to optimize AppLocker policy enforcement.
-MSHAttr: PreferredLib /library
 ms.assetid: a20efa20-bc98-40fe-bd81-28ec4905e0f6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/packaged-apps-and-packaged-app-installer-rules-in-applocker.md b/windows/keep-secure/packaged-apps-and-packaged-app-installer-rules-in-applocker.md
index 92a361abef..428029452b 100644
--- a/windows/keep-secure/packaged-apps-and-packaged-app-installer-rules-in-applocker.md
+++ b/windows/keep-secure/packaged-apps-and-packaged-app-installer-rules-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Packaged apps and packaged app installer rules in AppLocker (Windows 10)
 description: This topic explains the AppLocker rule collection for packaged app installers and packaged apps.
-MSHAttr: PreferredLib /library
 ms.assetid: 8fd44d08-a0c2-4c5b-a91f-5cb9989f971d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/microsoft-passport-event-id-200.md b/windows/keep-secure/passport-event-300.md
similarity index 97%
rename from windows/keep-secure/microsoft-passport-event-id-200.md
rename to windows/keep-secure/passport-event-300.md
index 417553ae4c..34b44eca0e 100644
--- a/windows/keep-secure/microsoft-passport-event-id-200.md
+++ b/windows/keep-secure/passport-event-300.md
@@ -1,7 +1,6 @@
 ---
-title: Event ID 300 Passport successfully created (Windows 10)
+title: Event ID 300 - Passport successfully created (Windows 10)
 description: This event is created when a Microsoft Passport for Enterprise is successfully created and registered with Azure Active Directory (Azure AD).
-MSHAttr: PreferredLib /library
 ms.assetid: 0DD59E75-1C5F-4CC6-BB0E-71C83884FF04
 keywords: ["ngc"]
 ms.prod: W10
diff --git a/windows/keep-secure/password-must-meet-complexity-requirements.md b/windows/keep-secure/password-must-meet-complexity-requirements.md
index c8d840ff1c..c4b7b4420c 100644
--- a/windows/keep-secure/password-must-meet-complexity-requirements.md
+++ b/windows/keep-secure/password-must-meet-complexity-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: Password must meet complexity requirements (Windows 10)
-description: Describes the best practices location values and security considerations for the Password must meet complexity requirements security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Password must meet complexity requirements security policy setting.
 ms.assetid: 94482ae3-9dda-42df-9782-2f66196e6afe
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Password must meet complexity requirements** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/password-policy.md b/windows/keep-secure/password-policy.md
index c87fe751c5..742ac0e7dd 100644
--- a/windows/keep-secure/password-policy.md
+++ b/windows/keep-secure/password-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Password Policy (Windows 10)
 description: An overview of password policies for Windows and links to information for each policy setting.
-MSHAttr: PreferredLib /library
 ms.assetid: aec1220d-a875-4575-9050-f02f9c54a3b6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/perform-volume-maintenance-tasks.md b/windows/keep-secure/perform-volume-maintenance-tasks.md
index 0da399f967..6c1b779093 100644
--- a/windows/keep-secure/perform-volume-maintenance-tasks.md
+++ b/windows/keep-secure/perform-volume-maintenance-tasks.md
@@ -1,7 +1,6 @@
 ---
 title: Perform volume maintenance tasks (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Perform volume maintenance tasks security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Perform volume maintenance tasks security policy setting.
 ms.assetid: b6990813-3898-43e2-8221-c9c06d893244
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Perform volume maintenance tasks** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/placeholder.md b/windows/keep-secure/placeholder.md
deleted file mode 100644
index 05ef632ece..0000000000
--- a/windows/keep-secure/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-#Placeholder content
\ No newline at end of file
diff --git a/windows/keep-secure/plan-for-applocker-policy-management.md b/windows/keep-secure/plan-for-applocker-policy-management.md
index b148963dc0..e3f5b525a5 100644
--- a/windows/keep-secure/plan-for-applocker-policy-management.md
+++ b/windows/keep-secure/plan-for-applocker-policy-management.md
@@ -1,7 +1,6 @@
 ---
 title: Plan for AppLocker policy management (Windows 10)
 description: This topic for describes the decisions you need to make to establish the processes for managing and maintaining AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: dccc196f-6ae0-4ae4-853a-a3312b18751b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/planning-and-deploying-advanced-security-audit-policies.md b/windows/keep-secure/planning-and-deploying-advanced-security-audit-policies.md
index ade847f599..a12a8500a2 100644
--- a/windows/keep-secure/planning-and-deploying-advanced-security-audit-policies.md
+++ b/windows/keep-secure/planning-and-deploying-advanced-security-audit-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Planning and deploying advanced security audit policies (Windows 10)
 description: This topic for the IT professional explains the options that security policy planners must consider and the tasks they must complete to deploy an effective security audit policy in a network that includes advanced security audit policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 7428e1db-aba8-407b-a39e-509671e5a442
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/prepare-people-to-use-microsoft-passport.md b/windows/keep-secure/prepare-people-to-use-microsoft-passport.md
index 02cd24d74b..b301c672a1 100644
--- a/windows/keep-secure/prepare-people-to-use-microsoft-passport.md
+++ b/windows/keep-secure/prepare-people-to-use-microsoft-passport.md
@@ -1,7 +1,6 @@
 ---
 title: Prepare people to use Microsoft Passport (Windows 10)
-description: When you set a policy to require Microsoft Passport in the workplace you will want to prepare people in your organization by explaining how to use Passport.
-MSHAttr: PreferredLib /library
+description: When you set a policy to require Microsoft Passport in the workplace, you will want to prepare people in your organization by explaining how to use Passport.
 ms.assetid: 5270B416-CE31-4DD9-862D-6C22A2AE508B
 keywords: ["identity", "PIN", "biometric", "Hello"]
 ms.prod: W10
@@ -18,14 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [On devices owned by the organization](#on-devices-owned-by-the-organization)
--   [On personal devices](#on-personal-devices)
--   [Using Windows Hello and biometrics](#using-windows-hello-and-biometrics)
--   [Use a phone to sign in to a PC](#bmk-remote)
--   [Related topics](#related-topics)
-
 When you set a policy to require Microsoft Passport in the workplace, you will want to prepare people in your organization by explaining how to use Passport.
 
 After enrollment in Passport, users should use their gesture (such as a PIN or fingerprint) for access to corporate resources. Their gesture is only valid on the enrolled device.
@@ -119,7 +110,7 @@ If your enterprise enables phone sign-in, users can pair a phone running Windows
 
 [Microsoft Passport errors during PIN creation](microsoft-passport-errors-during-pin-creation.md)
 
-[Event ID 300 - Passport successfully created](microsoft-passport-event-id-200.md)
+[Event ID 300 - Passport successfully created](passport-event-300.md)
 
  
 
diff --git a/windows/keep-secure/prepare-your-organization-for-bitlocker-planning-and-policies.md b/windows/keep-secure/prepare-your-organization-for-bitlocker-planning-and-policies.md
index e4849af0cf..a4df69db10 100644
--- a/windows/keep-secure/prepare-your-organization-for-bitlocker-planning-and-policies.md
+++ b/windows/keep-secure/prepare-your-organization-for-bitlocker-planning-and-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Prepare your organization for BitLocker Planning and policies (Windows 10)
 description: This topic for the IT professional explains how can you plan your BitLocker deployment.
-MSHAttr: PreferredLib /library
 ms.assetid: 6e3593b5-4e8a-40ac-808a-3fdbc948059d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/profile-single-process.md b/windows/keep-secure/profile-single-process.md
index 3a52096258..5144e6d70c 100644
--- a/windows/keep-secure/profile-single-process.md
+++ b/windows/keep-secure/profile-single-process.md
@@ -1,7 +1,6 @@
 ---
 title: Profile single process (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Profile single process security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Profile single process security policy setting.
 ms.assetid: c0963de4-4f5e-430e-bfcd-dfd68e66a075
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Profile single process** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/profile-system-performance.md b/windows/keep-secure/profile-system-performance.md
index e7e99e5dae..e9fdad2be0 100644
--- a/windows/keep-secure/profile-system-performance.md
+++ b/windows/keep-secure/profile-system-performance.md
@@ -1,7 +1,6 @@
 ---
 title: Profile system performance (Windows 10)
-description: This security policy reference topic for the IT professional describes the best practices location values policy management and security considerations for the Profile system performance security policy setting.
-MSHAttr: PreferredLib /library
+description: This security policy reference topic for the IT professional describes the best practices, location, values, policy management, and security considerations for the Profile system performance security policy setting.
 ms.assetid: ffabc3c5-9206-4105-94ea-84f597a54b2e
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 This security policy reference topic for the IT professional describes the best practices, location, values, policy management, and security considerations for the **Profile system performance** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/protect-bitlocker-from-pre-boot-attacks.md b/windows/keep-secure/protect-bitlocker-from-pre-boot-attacks.md
index 07b69540fd..c4991945a6 100644
--- a/windows/keep-secure/protect-bitlocker-from-pre-boot-attacks.md
+++ b/windows/keep-secure/protect-bitlocker-from-pre-boot-attacks.md
@@ -1,7 +1,6 @@
 ---
-title: Protect BitLocker from pre boot attacks (Windows 10)
-description: This detailed guide will help you understand the circumstances under which the use of pre boot authentication is recommended for devices running Windows 10 Windows 8.1 Windows 8 or Windows 7; and when it can be safely omitted from a device’s configuration.
-MSHAttr: PreferredLib /library
+title: Protect BitLocker from pre-boot attacks (Windows 10)
+description: This detailed guide will help you understand the circumstances under which the use of pre-boot authentication is recommended for devices running Windows 10, Windows 8.1, Windows 8, or Windows 7; and when it can be safely omitted from a device’s configuration.
 ms.assetid: 24d19988-fc79-4c45-b392-b39cba4ec86b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md b/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
index 3f3af1f356..1d7eabec2a 100644
--- a/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
+++ b/windows/keep-secure/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
@@ -1,7 +1,6 @@
 ---
-title: Control the health of Windows 10 based devices (Windows 10)
-description: This article details an end to end solution that helps you protect high value assets by enforcing controlling and reporting the health of Windows 10 based devices.
-MSHAttr: PreferredLib /library
+title: Control the health of Windows 10-based devices (Windows 10)
+description: This article details an end-to-end solution that helps you protect high-value assets by enforcing, controlling, and reporting the health of Windows 10-based devices.
 ms.assetid: 45DB1C41-C35D-43C9-A274-3AD5F31FE873
 keywords: ["security", "BYOD", "malware", "device health attestation", "mobile"]
 ms.prod: W10
@@ -17,16 +16,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Introduction](#introduction)
--   [Description of a robust end-to-end security solution](#description-of-a-robust-end-to-end-security-solution)
--   [Protect devices and enterprise credentials against threats](#protect-devices-and-enterprise-credentials-against-threats)
--   [Detect an unhealthy Windows 10-based device](#detect-unhealthy)
--   [Control the security of a Windows 10-based device before access is granted](#control-the-security-of-a-windows-10-based-device-before-access-is-granted)
--   [Takeaways and summary](#takeaways-and-summary)
--   [Related topics](#related-topics)
-
 This article details an end-to-end solution that helps you protect high-value assets by enforcing, controlling, and reporting the health of Windows 10-based devices.
 
 ## Introduction
diff --git a/windows/keep-secure/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md b/windows/keep-secure/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
index 6024136c4a..5ed8ed7a78 100644
--- a/windows/keep-secure/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
+++ b/windows/keep-secure/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
@@ -1,7 +1,6 @@
 ---
 title: Protecting cluster shared volumes and storage area networks with BitLocker (Windows 10)
 description: This topic for IT pros describes how to protect CSVs and SANs with BitLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: ecd25a10-42c7-4d31-8a7e-ea52c8ebc092
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md b/windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md
index efaea0bc5b..c67329f99a 100644
--- a/windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md
+++ b/windows/keep-secure/recovery-console-allow-automatic-administrative-logon.md
@@ -1,7 +1,6 @@
 ---
 title: Recovery console Allow automatic administrative logon (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Recovery console Allow automatic administrative logon security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Recovery console Allow automatic administrative logon security policy setting.
 ms.assetid: be2498fc-48f4-43f3-ad09-74664e45e596
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Recovery console: Allow automatic administrative logon** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md b/windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
index 9ea3be217b..f881d30d6d 100644
--- a/windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
+++ b/windows/keep-secure/recovery-console-allow-floppy-copy-and-access-to-all-drives-and-folders.md
@@ -1,7 +1,6 @@
 ---
 title: Recovery console Allow floppy copy and access to all drives and folders (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Recovery console Allow floppy copy and access to all drives and folders security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Recovery console Allow floppy copy and access to all drives and folders security policy setting.
 ms.assetid: a5b4ac0c-f33d-42b5-a866-72afa7cbd0bd
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Recovery console: Allow floppy copy and access to all drives and folders** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/refresh-an-applocker-policy.md b/windows/keep-secure/refresh-an-applocker-policy.md
index 8bc1277562..f134252dff 100644
--- a/windows/keep-secure/refresh-an-applocker-policy.md
+++ b/windows/keep-secure/refresh-an-applocker-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Refresh an AppLocker policy (Windows 10)
 description: This topic for IT professionals describes the steps to force an update for an AppLocker policy.
-MSHAttr: PreferredLib /library
 ms.assetid: 3f24fcbc-3926-46b9-a1a2-dd036edab8a9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/registry--global-object-access-auditing--sec-audit.md b/windows/keep-secure/registry--global-object-access-auditing--sec-audit.md
index f10ba5d290..f544039c14 100644
--- a/windows/keep-secure/registry--global-object-access-auditing--sec-audit.md
+++ b/windows/keep-secure/registry--global-object-access-auditing--sec-audit.md
@@ -1,7 +1,6 @@
 ---
 title: Registry (Global Object Access Auditing) (Windows 10)
-description: This topic for the IT professional describes the Advanced Security Audit policy setting Registry (Global Object Access Auditing) which enables you to configure a global system access control list (SACL) on the registry of a computer.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional describes the Advanced Security Audit policy setting, Registry (Global Object Access Auditing), which enables you to configure a global system access control list (SACL) on the registry of a computer.
 ms.assetid: 953bb1c1-3f76-43be-ba17-4aed2304f578
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/remove-computer-from-docking-station.md b/windows/keep-secure/remove-computer-from-docking-station.md
index 0de9086cf8..10454b9cdd 100644
--- a/windows/keep-secure/remove-computer-from-docking-station.md
+++ b/windows/keep-secure/remove-computer-from-docking-station.md
@@ -1,7 +1,6 @@
 ---
 title: Remove computer from docking station (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Remove computer from docking station security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Remove computer from docking station security policy setting.
 ms.assetid: 229a385a-a862-4973-899a-413b1b5b6c30
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Remove computer from docking station** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/replace-a-process-level-token.md b/windows/keep-secure/replace-a-process-level-token.md
index 8690be5428..e3a17bfad2 100644
--- a/windows/keep-secure/replace-a-process-level-token.md
+++ b/windows/keep-secure/replace-a-process-level-token.md
@@ -1,7 +1,6 @@
 ---
 title: Replace a process level token (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Replace a process level token security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Replace a process level token security policy setting.
 ms.assetid: 5add02db-6339-489e-ba21-ccc3ccbe8745
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Replace a process level token** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/requirements-for-deploying-applocker-policies.md b/windows/keep-secure/requirements-for-deploying-applocker-policies.md
index d8df3bc767..278b2c3be5 100644
--- a/windows/keep-secure/requirements-for-deploying-applocker-policies.md
+++ b/windows/keep-secure/requirements-for-deploying-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Requirements for deploying AppLocker policies (Windows 10)
 description: This deployment topic for the IT professional lists the requirements that you need to consider before you deploy AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 3e55bda2-3cd7-42c7-bad3-c7dfbe193d48
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/requirements-to-use-applocker.md b/windows/keep-secure/requirements-to-use-applocker.md
index d7317aeb7b..2921b46a0e 100644
--- a/windows/keep-secure/requirements-to-use-applocker.md
+++ b/windows/keep-secure/requirements-to-use-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Requirements to use AppLocker (Windows 10)
 description: This topic for the IT professional lists software requirements to use AppLocker on the supported Windows operating systems.
-MSHAttr: PreferredLib /library
 ms.assetid: dc380535-071e-4794-8f9d-e5d1858156f0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/reset-account-lockout-counter-after.md b/windows/keep-secure/reset-account-lockout-counter-after.md
index f0917a4569..4267057664 100644
--- a/windows/keep-secure/reset-account-lockout-counter-after.md
+++ b/windows/keep-secure/reset-account-lockout-counter-after.md
@@ -1,7 +1,6 @@
 ---
 title: Reset account lockout counter after (Windows 10)
-description: Describes the best practices location values and security considerations for the Reset account lockout counter after security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Reset account lockout counter after security policy setting.
 ms.assetid: d5ccf6dd-5ba7-44a9-8e0b-c478d8b1442c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Reset account lockout counter after** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/restore-files-and-directories.md b/windows/keep-secure/restore-files-and-directories.md
index be161860d4..e0941e62be 100644
--- a/windows/keep-secure/restore-files-and-directories.md
+++ b/windows/keep-secure/restore-files-and-directories.md
@@ -1,7 +1,6 @@
 ---
 title: Restore files and directories (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Restore files and directories security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Restore files and directories security policy setting.
 ms.assetid: c673c0fa-6f49-4edd-8c1f-c5e8513f701d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Restore files and directories** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/run-the-automatically-generate-rules-wizard.md b/windows/keep-secure/run-the-automatically-generate-rules-wizard.md
index 77d3298fc8..63611e7155 100644
--- a/windows/keep-secure/run-the-automatically-generate-rules-wizard.md
+++ b/windows/keep-secure/run-the-automatically-generate-rules-wizard.md
@@ -1,7 +1,6 @@
 ---
 title: Run the Automatically Generate Rules wizard (Windows 10)
 description: This topic for IT professionals describes steps to run the wizard to create AppLocker rules on a reference device.
-MSHAttr: PreferredLib /library
 ms.assetid: 8cad1e14-d5b2-437c-8f88-70cffd7b3d8e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/schema-extensions-for-windows-server-2008-r2-to-support-ad-ds-backup-of-tpm-information-from-windows-8-clients.md b/windows/keep-secure/schema-extensions-for-windows-server-2008-r2-to-support-ad-ds-backup-of-tpm-information-from-windows-8-clients.md
index ecbea1c7a6..6916504ad6 100644
--- a/windows/keep-secure/schema-extensions-for-windows-server-2008-r2-to-support-ad-ds-backup-of-tpm-information-from-windows-8-clients.md
+++ b/windows/keep-secure/schema-extensions-for-windows-server-2008-r2-to-support-ad-ds-backup-of-tpm-information-from-windows-8-clients.md
@@ -1,7 +1,6 @@
 ---
 title: AD DS schema extensions to support TPM backup (Windows 10)
 description: This topic provides more details about this change and provides template schema extensions that you can incorporate into your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: beb7097c-e674-4eab-b8e2-6f67c85d1f3f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/script-rules-in-applocker.md b/windows/keep-secure/script-rules-in-applocker.md
index 768f8f3532..d1c18e6cfb 100644
--- a/windows/keep-secure/script-rules-in-applocker.md
+++ b/windows/keep-secure/script-rules-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Script rules in AppLocker (Windows 10)
 description: This topic describes the file formats and available default rules for the script rule collection.
-MSHAttr: PreferredLib /library
 ms.assetid: fee24ca4-935a-4c5e-8a92-8cf1d134d35f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md b/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md
index cb0271a933..6cc38ffbeb 100644
--- a/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md
+++ b/windows/keep-secure/secpol-advanced-security-audit-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Advanced security audit policy settings (Windows 10)
 description: Provides information about the advanced security audit policy settings that are available in Windows and the audit events that they generate.
-MSHAttr: PreferredLib /library
 ms.assetid: 6BF9A642-DBC3-4101-94A3-B2316C553CE3
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/security-auditing-overview-glbl.md b/windows/keep-secure/security-auditing-overview-glbl.md
index f342ddea7d..bc9ff675c5 100644
--- a/windows/keep-secure/security-auditing-overview-glbl.md
+++ b/windows/keep-secure/security-auditing-overview-glbl.md
@@ -1,7 +1,6 @@
 ---
 title: Security auditing (Windows 10)
 description: Topics in this section are for IT professionals and describes the security auditing features in Windows and how your organization can benefit from using these technologies to enhance the security and manageability of your network.
-MSHAttr: PreferredLib /library
 ms.assetid: 2d9b8142-49bd-4a33-b246-3f0c2a5f32d4
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/security-considerations-for-applocker.md b/windows/keep-secure/security-considerations-for-applocker.md
index f6546a904d..0fddbefbdc 100644
--- a/windows/keep-secure/security-considerations-for-applocker.md
+++ b/windows/keep-secure/security-considerations-for-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Security considerations for AppLocker (Windows 10)
 description: This topic for the IT professional describes the security considerations you need to address when implementing AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 354a5abb-7b31-4bea-a442-aa9666117625
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/security-options.md b/windows/keep-secure/security-options.md
index e6713bcb4d..5a4500b957 100644
--- a/windows/keep-secure/security-options.md
+++ b/windows/keep-secure/security-options.md
@@ -1,7 +1,6 @@
 ---
 title: Security Options (Windows 10)
 description: Provides an introduction to the settings under Security Options of the local security policies and links to information about each setting.
-MSHAttr: PreferredLib /library
 ms.assetid: 405ea253-8116-4e57-b08e-14a8dcdca92b
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/security-policy-settings-reference.md b/windows/keep-secure/security-policy-settings-reference.md
index 76743c5d10..62c40372cc 100644
--- a/windows/keep-secure/security-policy-settings-reference.md
+++ b/windows/keep-secure/security-policy-settings-reference.md
@@ -1,7 +1,6 @@
 ---
 title: Security policy settings reference (Windows 10)
-description: This reference of security settings provides information about how to implement and manage security policies including setting options and security considerations.
-MSHAttr: PreferredLib /library
+description: This reference of security settings provides information about how to implement and manage security policies, including setting options and security considerations.
 ms.assetid: ef5a4579-15a8-4507-9a43-b7ccddcb0ed1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/security-policy-settings.md b/windows/keep-secure/security-policy-settings.md
index 3a71388b32..67592a65d4 100644
--- a/windows/keep-secure/security-policy-settings.md
+++ b/windows/keep-secure/security-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Security policy settings (Windows 10)
-description: This reference topic describes the common scenarios architecture and processes for security settings.
-MSHAttr: PreferredLib /library
+description: This reference topic describes the common scenarios, architecture, and processes for security settings.
 ms.assetid: e7ac5204-7f6c-4708-a9f6-6af712ca43b9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Policy-based security settings management](#policy-based-security-settings-management)
--   [Security Settings extension architecture](#w2k3tr-gpssp-how-ebls)
--   [Security settings policy processes and interactions](#w2k3tr-gpssp-how-hjxe)
-
 This reference topic describes the common scenarios, architecture, and processes for security settings.
 
 Security policy settings are rules that administrators configure on a computer or multiple devices for the purpose of protecting resources on a device or network. The Security Settings extension of the Local Group Policy Editor snap-in allows you to define security configurations as part of a Group Policy Object (GPO). The GPOs are linked to Active Directory containers such as sites, domains, or organizational units, and they enable you to manage security settings for multiple devices from any device joined to the domain. Security settings policies are used as part of your overall security implementation to help secure domain controllers, servers, clients, and other resources in your organization.
diff --git a/windows/keep-secure/security-technologies.md b/windows/keep-secure/security-technologies.md
index 735254f8e9..79e205460a 100644
--- a/windows/keep-secure/security-technologies.md
+++ b/windows/keep-secure/security-technologies.md
@@ -1,7 +1,6 @@
 ---
 title: Security technologies (Windows 10)
 description: Learn more about the different security technologies that are available in Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: BFE2DE22-B0CE-465B-8CF6-28F64464DF08
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/select-types-of-rules-to-create.md b/windows/keep-secure/select-types-of-rules-to-create.md
index d707e5737d..b40dc6855b 100644
--- a/windows/keep-secure/select-types-of-rules-to-create.md
+++ b/windows/keep-secure/select-types-of-rules-to-create.md
@@ -1,7 +1,6 @@
 ---
 title: Select the types of rules to create (Windows 10)
 description: This topic lists resources you can use when selecting your application control policy rules by using AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 14751169-0ed1-47cc-822c-8c01a7477784
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/shut-down-the-system.md b/windows/keep-secure/shut-down-the-system.md
index 213f18c7cc..146683721a 100644
--- a/windows/keep-secure/shut-down-the-system.md
+++ b/windows/keep-secure/shut-down-the-system.md
@@ -1,7 +1,6 @@
 ---
 title: Shut down the system (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Shut down the system security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Shut down the system security policy setting.
 ms.assetid: c8e8f890-153a-401e-a957-ba6a130304bf
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Shut down the system** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md b/windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
index 8791119d71..90d093a627 100644
--- a/windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
+++ b/windows/keep-secure/shutdown-allow-system-to-be-shut-down-without-having-to-log-on.md
@@ -1,7 +1,6 @@
 ---
 title: Shutdown Allow system to be shut down without having to log on (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Shutdown Allow system to be shut down without having to log on security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Shutdown Allow system to be shut down without having to log on security policy setting.
 ms.assetid: f3964767-5377-4416-8eb3-e14d553a7315
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Shutdown: Allow system to be shut down without having to log on** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md b/windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md
index 8aac347159..1076dedd2f 100644
--- a/windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md
+++ b/windows/keep-secure/shutdown-clear-virtual-memory-pagefile.md
@@ -1,7 +1,6 @@
 ---
 title: Shutdown Clear virtual memory pagefile (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Shutdown Clear virtual memory pagefile security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the Shutdown Clear virtual memory pagefile security policy setting.
 ms.assetid: 31400078-6c56-4891-a6df-6dfb403c4bc9
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **Shutdown: Clear virtual memory pagefile** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/store-passwords-using-reversible-encryption.md b/windows/keep-secure/store-passwords-using-reversible-encryption.md
index 8083c9a873..57c859368c 100644
--- a/windows/keep-secure/store-passwords-using-reversible-encryption.md
+++ b/windows/keep-secure/store-passwords-using-reversible-encryption.md
@@ -1,7 +1,6 @@
 ---
 title: Store passwords using reversible encryption (Windows 10)
-description: Describes the best practices location values and security considerations for the Store passwords using reversible encryption security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the Store passwords using reversible encryption security policy setting.
 ms.assetid: 57f958c2-f1e9-48bf-871b-0a9b3299e238
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,12 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **Store passwords using reversible encryption** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md b/windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md
index f55e1e935c..3da96de40b 100644
--- a/windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md
+++ b/windows/keep-secure/switch-pcr-banks-on-tpm-2-0-devices.md
@@ -1,7 +1,6 @@
 ---
 title: Switch PCR banks on TPM 2.0 devices (Windows 10)
 description: A Platform Configuration Register (PCR) is a memory location in the TPM that has some unique properties.
-MSHAttr: PreferredLib /library
 ms.assetid: 743FCCCB-99A9-4636-8F48-9ECB3A3D10DE
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/synchronize-directory-service-data.md b/windows/keep-secure/synchronize-directory-service-data.md
index c34486fca2..f27a3177b6 100644
--- a/windows/keep-secure/synchronize-directory-service-data.md
+++ b/windows/keep-secure/synchronize-directory-service-data.md
@@ -1,7 +1,6 @@
 ---
 title: Synchronize directory service data (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Synchronize directory service data security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Synchronize directory service data security policy setting.
 ms.assetid: 97b0aaa4-674f-40f4-8974-b4bfb12c232c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Synchronize directory service data** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md b/windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
index 18eae3156d..ccdb41c94f 100644
--- a/windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
+++ b/windows/keep-secure/system-cryptography-force-strong-key-protection-for-user-keys-stored-on-the-computer.md
@@ -1,7 +1,6 @@
 ---
 title: System cryptography Force strong key protection for user keys stored on the computer (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the System cryptography Force strong key protection for user keys stored on the computer security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the System cryptography Force strong key protection for user keys stored on the computer security policy setting.
 ms.assetid: 8cbff267-881e-4bf6-920d-b583a5ff7de0
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **System cryptography: Force strong key protection for user keys stored on the computer** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md b/windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
index 042976d501..8c2c61ba3e 100644
--- a/windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
+++ b/windows/keep-secure/system-cryptography-use-fips-compliant-algorithms-for-encryption-hashing-and-signing.md
@@ -1,7 +1,6 @@
 ---
-title: System cryptography Use FIPS compliant algorithms for encryption hashing and signing (Windows 10)
-description: This security policy reference topic for the IT professional describes the best practices location values policy management and security considerations for this policy setting.
-MSHAttr: PreferredLib /library
+title: System cryptography Use FIPS compliant algorithms for encryption, hashing, and signing (Windows 10)
+description: This security policy reference topic for the IT professional describes the best practices, location, values, policy management and security considerations for this policy setting.
 ms.assetid: 83988865-dc0f-45eb-90d1-ee33495eb045
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 This security policy reference topic for the IT professional describes the best practices, location, values, policy management and security considerations for this policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md b/windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
index 694fddc10f..d26e95bbce 100644
--- a/windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
+++ b/windows/keep-secure/system-objects-require-case-insensitivity-for-non-windows-subsystems.md
@@ -1,7 +1,6 @@
 ---
-title: System objects Require case insensitivity for non Windows subsystems (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the System objects Require case insensitivity for non Windows subsystems security policy setting.
-MSHAttr: PreferredLib /library
+title: System objects Require case insensitivity for non-Windows subsystems (Windows 10)
+description: Describes the best practices, location, values, policy management and security considerations for the System objects Require case insensitivity for non-Windows subsystems security policy setting.
 ms.assetid: 340d6769-8f33-4067-8470-1458978d1522
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **System objects: Require case insensitivity for non-Windows subsystems** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects--eg-symbolic-links.md b/windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects--eg-symbolic-links.md
index 16fabde7a3..3927b70a25 100644
--- a/windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects--eg-symbolic-links.md
+++ b/windows/keep-secure/system-objects-strengthen-default-permissions-of-internal-system-objects--eg-symbolic-links.md
@@ -1,7 +1,6 @@
 ---
 title: System objects Strengthen default permissions of internal system objects (e.g. Symbolic Links) (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the System objects Strengthen default permissions of internal system objects (e.g. Symbolic Links) security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the System objects Strengthen default permissions of internal system objects (e.g. Symbolic Links) security policy setting.
 ms.assetid: 3a592097-9cf5-4fd0-a504-7cbfab050bb6
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **System objects: Strengthen default permissions of internal system objects (e.g. Symbolic Links)** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-settings-optional-subsystems.md b/windows/keep-secure/system-settings-optional-subsystems.md
index 4c6d75d096..6dc7df6ae0 100644
--- a/windows/keep-secure/system-settings-optional-subsystems.md
+++ b/windows/keep-secure/system-settings-optional-subsystems.md
@@ -1,7 +1,6 @@
 ---
 title: System settings Optional subsystems (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the System settings Optional subsystems security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the System settings Optional subsystems security policy setting.
 ms.assetid: 5cb6519a-4f84-4b45-8072-e2aa8a72fb78
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **System settings: Optional subsystems** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md b/windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
index 92e301fc51..278033dbc8 100644
--- a/windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
+++ b/windows/keep-secure/system-settings-use-certificate-rules-on-windows-executables-for-software-restriction-policies.md
@@ -1,7 +1,6 @@
 ---
 title: System settings Use certificate rules on Windows executables for Software Restriction Policies (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the System settings Use certificate rules on Windows executables for Software Restriction Policies security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the System settings Use certificate rules on Windows executables for Software Restriction Policies security policy setting.
 ms.assetid: 2380d93b-b553-4e56-a0c0-d1ef740d089c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **System settings: Use certificate rules on Windows executables for Software Restriction Policies** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/take-ownership-of-files-or-other-objects.md b/windows/keep-secure/take-ownership-of-files-or-other-objects.md
index 1a1a205546..6ec1df5665 100644
--- a/windows/keep-secure/take-ownership-of-files-or-other-objects.md
+++ b/windows/keep-secure/take-ownership-of-files-or-other-objects.md
@@ -1,7 +1,6 @@
 ---
 title: Take ownership of files or other objects (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the Take ownership of files or other objects security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management, and security considerations for the Take ownership of files or other objects security policy setting.
 ms.assetid: cb8595d1-74cc-4176-bb15-d97663eebb2d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management, and security considerations for the **Take ownership of files or other objects** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/test-an-applocker-policy-by-using-test-applockerpolicy.md b/windows/keep-secure/test-an-applocker-policy-by-using-test-applockerpolicy.md
index a14e200603..288b71b44d 100644
--- a/windows/keep-secure/test-an-applocker-policy-by-using-test-applockerpolicy.md
+++ b/windows/keep-secure/test-an-applocker-policy-by-using-test-applockerpolicy.md
@@ -1,7 +1,6 @@
 ---
-title: Test an AppLocker policy by using Test AppLockerPolicy (Windows 10)
+title: Test an AppLocker policy by using Test-AppLockerPolicy (Windows 10)
 description: This topic for IT professionals describes the steps to test an AppLocker policy prior to importing it into a Group Policy Object (GPO) or another computer.
-MSHAttr: PreferredLib /library
 ms.assetid: 048bfa38-6825-4a9a-ab20-776cf79f402a
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/test-and-update-an-applocker-policy.md b/windows/keep-secure/test-and-update-an-applocker-policy.md
index 13461d45a6..5157667a41 100644
--- a/windows/keep-secure/test-and-update-an-applocker-policy.md
+++ b/windows/keep-secure/test-and-update-an-applocker-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Test and update an AppLocker policy (Windows 10)
 description: This topic discusses the steps required to test an AppLocker policy prior to deployment.
-MSHAttr: PreferredLib /library
 ms.assetid: 7d53cbef-078c-4d20-8b00-e821e33b6ea1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/tools-to-use-with-applocker.md b/windows/keep-secure/tools-to-use-with-applocker.md
index ffb92415b8..bef26fd57a 100644
--- a/windows/keep-secure/tools-to-use-with-applocker.md
+++ b/windows/keep-secure/tools-to-use-with-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Tools to use with AppLocker (Windows 10)
 description: This topic for the IT professional describes the tools available to create and administer AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: db2b7cb3-7643-4be5-84eb-46ba551e1ad1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/tpm-fundamentals-windows-8.md b/windows/keep-secure/tpm-fundamentals-windows-8.md
index 01f0f2b510..3c8b119c13 100644
--- a/windows/keep-secure/tpm-fundamentals-windows-8.md
+++ b/windows/keep-secure/tpm-fundamentals-windows-8.md
@@ -1,7 +1,6 @@
 ---
 title: TPM fundamentals (Windows 10)
 description: This topic for the IT professional provides a description of the components of the Trusted Platform Module (TPM 1.2 and TPM 2.0) and explains how they are used to mitigate dictionary attacks.
-MSHAttr: PreferredLib /library
 ms.assetid: ac90f5f9-9a15-4e87-b00d-4adcf2ec3000
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/troubleshoot-windows-defender-for-windows-10.md b/windows/keep-secure/troubleshoot-windows-defender-for-windows-10.md
index ab300fec19..c926b7d396 100644
--- a/windows/keep-secure/troubleshoot-windows-defender-for-windows-10.md
+++ b/windows/keep-secure/troubleshoot-windows-defender-for-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshoot Windows Defender in Windows 10 (Windows 10)
 description: IT professionals can review information about event IDs in Windows Defender for Windows 10 and see any relevant action they can take.
-MSHAttr: PreferredLib /library
 ms.assetid: EE488CC1-E340-4D47-B50B-35BD23CB4D70
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -40,2168 +39,1397 @@ Use the information in this table to help troubleshoot Windows Defender client e
 
 You can find a complete list of the Microsoft antimalware *event IDs*, the symbol, and the description of each ID in [Windows Server Antimalware Events TechNet](https://technet.microsoft.com/library/dn913615.aspx).
 
-<table>
-<tr>
-<th rowspan="3">Event ID: 1000</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_STARTED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan started.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID:</dt>
-<dt>Scan Type: </dt>
-<dt>Scan Parameters:</dt>
-<dt>Scan Resources:</dt>
-<dt>User:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1001</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_COMPLETED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan finished.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID:</dt>
-<dt>Scan Type:</dt>
-<dt>Scan Parameters:</dt>
-<dt>User:</dt>
-<dt>Scan Time:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1002</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_CANCELLED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan was stopped before it finished.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID:</dt>
-<dt>Scan Type:</dt>
-<dt>Scan Parameters:</dt>
-<dt>User:</dt>
-<dt>Scan Time:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1003</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_PAUSED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan was paused.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID:</dt>
-<dt>Scan Type:</dt>
-<dt>Scan Parameters:</dt>
-<dt>User:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1004</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_RESUMED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan was resumed.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID:</dt>
-<dt>Scan Type:</dt>
-<dt>Scan Parameters:</dt>
-<dt>User:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1005</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SCAN_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>An antimalware scan failed. 
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<dl>
-<dt>Scan ID: </dt>
-<dt>Scan Type: </dt>
-<dt>Scan Parameters:</dt>
-<dt>User: </dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The Windows Defender client encountered an error, and the current scan has stopped. The scan might fail due to a client-side issue. This event record includes the scan ID, type of scan (antivirus, antispyware, antimalware), scan parameters, the user that started the scan, the error code, and a description of the error.
+ 
+
+Event ID: 1000
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_STARTED**
+
+Message:
+
+**An antimalware scan started.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+Scan Resources:
+User:
+
+&lt;ID number of the relevant scan.&gt;
+&lt;Scan type&gt;, for example:
+Scan Parameters:
+Scan Resources:
+User:
+Event ID: 1001
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_COMPLETED**
+
+Message:
+
+**An antimalware scan finished.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+User:
+Scan Time:
+Event ID: 1002
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_CANCELLED**
+
+Message:
+
+**An antimalware scan was stopped before it finished.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+User:
+Scan Time:
+Event ID: 1003
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_PAUSED**
+
+Message:
+
+**An antimalware scan was paused.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+User:
+Event ID: 1004
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_RESUMED**
+
+Message:
+
+**An antimalware scan was resumed.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+User:
+Event ID: 1005
+Symbolic name:
+
+**MALWAREPROTECTION\_SCAN\_FAILED**
+
+Message:
+
+**An antimalware scan failed.**
+
+Description:
+
+Scan ID:
+Scan Type:
+Scan Parameters:
+User:
+Error Code:
+Error Description:
+User action:
+
+The Windows Defender client encountered an error, and the current scan has stopped. The scan might fail due to a client-side issue. This event record includes the scan ID, type of scan (antivirus, antispyware, antimalware), scan parameters, the user that started the scan, the error code, and a description of the error.
+
+To troubleshoot this event:
+
+1.  Run the scan again.
+2.  If it fails in the same way, go to the [Microsoft Support site](http://go.microsoft.com/fwlink/?LinkId=215163), enter the error number in the **Search** box to look for the error code.
+3.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 1006
+Symbolic name:
+
+**MALWAREPROTECTION\_MALWARE\_DETECTED**
+
+Message:
+
+**The antimalware engine found malware or other potentially unwanted software.**
+
+Description:
+
+For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+Status:
+User:
+Process Name:
+Signature Version:
+Engine Version:
+Event ID: 1007
+Symbolic name:
+
+**MALWAREPROTECTION\_MALWARE\_ACTION\_TAKEN**
+
+Message:
+
+**The antimalware platform performed an action to protect your system from malware or other potentially unwanted software.**
+
+Description:
+
+Windows Defender has taken action to protect this machine from malware or other potentially unwanted software. For more information please see the following:
+
+User:
+Name:
+ID:
+Severity:
+Category:
+Action:
+Status:
+Signature Version:
+Engine Version:
+Event ID: 1008
+Symbolic name:
+
+**MALWAREPROTECTION\_MALWARE\_ACTION\_FAILED**
+
+Message:
+
+**The antimalware platform attempted to perform an action to protect your system from malware or other potentially unwanted software, but the action failed.**
+
+Description:
+
+Windows Defender has encountered an error when taking action on malware or other potentially unwanted software. For more information please see the following:
+
+User:
+Name:
+ID:
+Severity:
+Category:
+Path:
+Action:
+Error Code:
+Error Description:
+Status:
+Signature Version:
+Engine Version:
+Event ID: 1009
+Symbolic name:
+
+**MALWAREPROTECTION\_QUARANTINE\_RESTORE**
+
+Message:
+
+**The antimalware platform restored an item from quarantine.**
+
+Description:
+
+Windows Defender has restored an item from quarantine. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+User:
+Signature Version:
+Engine Version:
+Event ID: 1010
+Symbolic name:
+
+**MALWAREPROTECTION\_QUARANTINE\_RESTORE\_FAILED**
+
+Message:
+
+**The antimalware platform could not restore an item from quarantine.**
+
+Description:
+
+Windows Defender has encountered an error trying to restore an item from quarantine. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+User:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+Event ID: 1011
+Symbolic name:
+
+**MALWAREPROTECTION\_QUARANTINE\_DELETE**
+
+Message:
+
+**The antimalware platform deleted an item from quarantine.**
+
+Description:
+
+Windows Defender has deleted an item from quarantine. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+User:
+Signature Version:
+Engine Version:
+Event ID: 1012
+Symbolic name:
+
+**MALWAREPROTECTION\_QUARANTINE\_DELETE\_FAILED**
+
+Message:
+
+**The antimalware platform could not delete an item from quarantine.**
+
+Description:
+
+Windows Defender has encountered an error trying to delete an item from quarantine. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+User:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+Event ID: 1013
+Symbolic name:
+
+**MALWAREPROTECTION\_MALWARE\_HISTORY\_DELETE**
+
+Message:
+
+**The antimalware platform deleted history of malware and other potentially unwanted software.**
+
+Description:
+
+Windows Defender has removed history of malware and other potentially unwanted software.
+
+Time:
+User:
+Event ID: 1014
+Symbolic name:
+
+**MALWAREPROTECTION\_MALWARE\_HISTORY\_DELETE\_FAILED**
+
+Message:
+
+The antimalware platform could not delete history of malware and other potentially unwanted software.
+
+Description:
+
+Windows Defender has encountered an error trying to remove history of malware and other potentially unwanted software.
+
+Time:
+User:
+Error Code:
+Error Description:
+Event ID: 1015
+Symbolic name:
+
+**MALWAREPROTECTION\_BEHAVIOR\_DETECTED**
+
+Message:
+
+**The antimalware platform detected suspicious behavior.**
+
+Description:
+
+Windows Defender has detected a suspicious behavior. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+Status:
+User:
+Process Name:
+Signature ID:
+Signature Version:
+Engine Version:
+Fidelity Label:
+Target File Name:
+Event ID: 1116
+Symbolic name:
+
+**MALWAREPROTECTION\_STATE\_MALWARE\_DETECTED**
+
+Message:
+
+**The antimalware platform detected malware or other potentially unwanted software.**
+
+Description:
+
+Windows Defender has detected malware or other potentially unwanted software. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+User:
+Process Name:
+Signature Version:
+Engine Version:
+User action:
+
+No action is required. Windows Defender can suspend and take routine action on this threat. If you want to remove the threat manually, in the Windows Defender interface, click **Clean Computer**.
+
+Event ID: 1117
+Symbolic name:
+
+**MALWAREPROTECTION\_STATE\_MALWARE\_ACTION\_TAKEN**
+
+Message:
+
+**The antimalware platform performed an action to protect your system from malware or other potentially unwanted software.**
+
+Description:
+
+Windows Defender has taken action to protect this machine from malware or other potentially unwanted software. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+User:
+Process Name:
+Action:
+Action Status:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+User action:
+
+No action is necessary. Windows Defender removed or quarantined a threat.
+
+Event ID: 1118
+Symbolic name:
+
+**MALWAREPROTECTION\_STATE\_MALWARE\_ACTION\_FAILED**
+
+Message:
+
+**The antimalware platform attempted to perform an action to protect your system from malware or other potentially unwanted software, but the action failed.**
+
+Description:
+
+Windows Defender has encountered a non-critical error when taking action on malware or other potentially unwanted software. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+User:
+Process Name:
+Action:
+Action Status:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+User action:
+
+No action is necessary. Windows Defender failed to complete a task related to the malware remediation. This is not a critical failure.
+
+Event ID: 1119
+Symbolic name:
+
+**MALWAREPROTECTION\_STATE\_MALWARE\_ACTION\_CRITICALLY\_FAILED**
+
+Message:
+
+**The antimalware platform encountered a critical error when trying to take action on malware or other potentially unwanted software. There are more details in the event message.**
+
+Description:
+
+Windows Defender has encountered a critical error when taking action on malware or other potentially unwanted software. For more information please see the following:
+
+Name:
+ID:
+Severity:
+Category:
+Path:
+Detection Origin:
+Detection Type:
+Detection Source:
+User:
+Process Name:
+Action:
+Action Status:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+User action:
+
+The Windows Defender client encountered this error due to critical issues. The endpoint might not be protected. Review the error description then follow the relevant **User action** steps below.
 
-</p>
-<p>To troubleshoot this event:
-<ol>
-<li>Run the scan again.</li>
-<li>If it fails in the same way, go to the <a href="http://go.microsoft.com/fwlink/?LinkId=215163">Microsoft Support site</a>, enter the error number in the <b>Search</b> box to look for the error code.</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1006</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_MALWARE_DETECTED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine found malware or other potentially unwanted software.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category</dt>
-<dt>Path:</dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>Status:</dt>
-<dt>User: </dt>
-<dt>Process Name:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1007</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_MALWARE_ACTION_TAKEN
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform performed an action to protect your system from malware or other potentially unwanted software.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has taken action to protect this machine from malware or other potentially unwanted software. For more information please see the following:</p>
-<dl>
-<dt>User:</dt>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Action:</dt>
-<dt>Status:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1008</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_MALWARE_ACTION_FAILED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform attempted to perform an action to protect your system from malware or other potentially unwanted software, but the action failed.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error when taking action on malware or other potentially unwanted software. For more information please see the following:</p>
-<dl>
-<dt>User:</dt>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Action:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description: </dt>
-<dt>Status:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1009</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_QUARANTINE_RESTORE
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform restored an item from quarantine.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has restored an item from quarantine. For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>User:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1010</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_QUARANTINE_RESTORE_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform could not restore an item from quarantine.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to restore an item from quarantine. For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>User:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1011</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_QUARANTINE_DELETE</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform deleted an item from quarantine.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has deleted an item from quarantine.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>User:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1012</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_QUARANTINE_DELETE_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform could not delete an item from quarantine.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to delete an item from quarantine.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>User:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1013</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_MALWARE_HISTORY_DELETE
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform deleted history of malware and other potentially unwanted software.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has removed history of malware and other potentially unwanted software.</p>
-<dl>
-<dt>Time: </dt>
-<dt>User:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1014</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_MALWARE_HISTORY_DELETE_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p>The antimalware platform could not delete history of malware and other potentially unwanted software.</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to remove history of malware and other potentially unwanted software.</p>
-<dl>
-<dt>Time: </dt>
-<dt>User:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 1015</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_BEHAVIOR_DETECTED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform detected suspicious behavior.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has detected a suspicious behavior.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>Status:</dt>
-<dt>User:</dt>
-<dt>Process Name:</dt>
-<dt>Signature ID:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-<dt>Fidelity Label:</dt>
-<dt>Target File Name:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1116</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_STATE_MALWARE_DETECTED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform detected malware or other potentially unwanted software.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has detected malware or other potentially unwanted software.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>User:</dt>
-<dt>Process Name:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is required. Windows Defender can suspend and take routine action on this threat. If you want to remove the threat manually, in the Windows Defender interface, click <b>Clean Computer</b>.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1117</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_STATE_MALWARE_ACTION_TAKEN
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform performed an action to protect your system from malware or other potentially unwanted software.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has taken action to protect this machine from malware or other potentially unwanted software.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID:</dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>User:</dt>
-<dt>Process Name:</dt>
-<dt>Action:</dt>
-<dt>Action Status:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. Windows Defender removed or quarantined a threat. </p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1118</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_STATE_MALWARE_ACTION_FAILED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform attempted to perform an action to protect your system from malware or other potentially unwanted software, but the action failed.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered a non-critical error when taking action on malware or other potentially unwanted software.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>User:</dt>
-<dt>Process Name:</dt>
-<dt>Action:</dt>
-<dt>Action Status:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. Windows Defender failed to complete a task related to the malware remediation. This is not a critical failure.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1119</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_STATE_MALWARE_ACTION_CRITICALLY_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform encountered a critical error when trying to take action on malware or other potentially unwanted software. There are more details in the event message.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered a critical error when taking action on malware or other potentially unwanted software.  
-For more information please see the following:</p>
-<dl>
-<dt>Name: </dt>
-<dt>ID: </dt>
-<dt>Severity: </dt>
-<dt>Category:</dt>
-<dt>Path: </dt>
-<dt>Detection Origin:</dt>
-<dt>Detection Type:</dt>
-<dt>Detection Source:</dt>
-<dt>User:</dt>
-<dt>Process Name:</dt>
-<dt>Action:</dt>
-<dt>Action Status:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The Windows Defender client encountered this error due to critical issues. The endpoint might not be protected. Review the error description then follow the relevant <b>User action</b> steps below.</p>
 <table>
-<tr>
-<th>Action</th>
-<th>User action</th>
+<colgroup>
+<col width="50%" />
+<col width="50%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th align="left">Action</th>
+<th align="left">User action</th>
 </tr>
-<tr>
-<td>
-<p><b>Remove</b></p>
-</td>
-<td>
-<p>Update the definitions then verify that the removal was successful.</p>
-</td>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left"><p><strong>Remove</strong></p></td>
+<td align="left"><p>Update the definitions then verify that the removal was successful.</p></td>
 </tr>
-<tr>
-<td>
-<p><b>Clean</b></p>
-</td>
-<td>
-<p>Update the definitions then verify that the remediation was successful.</p>
-</td>
+<tr class="even">
+<td align="left"><p><strong>Clean</strong></p></td>
+<td align="left"><p>Update the definitions then verify that the remediation was successful.</p></td>
 </tr>
-<tr>
-<td>
-<p><b>Quarantine</b></p>
-</td>
-<td>
-<p>Update the definitions and verify that the user has permission to access the necessary resources.</p>
-</td>
+<tr class="odd">
+<td align="left"><p><strong>Quarantine</strong></p></td>
+<td align="left"><p>Update the definitions and verify that the user has permission to access the necessary resources.</p></td>
 </tr>
-<tr>
-<td>
-<p><b>Allow</b></p>
-</td>
-<td>
-<p>Verify that the user has permission to access the necessary resources.</p>
-</td>
+<tr class="even">
+<td align="left"><p><strong>Allow</strong></p></td>
+<td align="left"><p>Verify that the user has permission to access the necessary resources.</p></td>
 </tr>
+</tbody>
 </table>
-<p> </p>
-<p>If this event persists:<ol>
-<li>Run the scan again.</li>
-<li>If it fails in the same way, go to the <a href="http://go.microsoft.com/fwlink/?LinkId=215163">Microsoft Support site</a>, enter the error number in the <b>Search</b> box to look for the error code.</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1120</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_THREAT_HASH</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Windows Defender has deduced the hashes for a threat resource.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender client is up and running in a healthy state.</p>
-<dl>
-<dt>Current Platform Version: </dt>
-<dt>Threat Resource Path:</dt>
-<dt>Hashes:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td></td>
-<td>
-<div class="alert"><b>Note</b>  This event will only be logged if the following policy is set: <b>ThreatFileHashLogging 	unsigned</b>.</div>
-<div> </div>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 1150</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SERVICE_HEALTHY</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>If your antimalware platform reports status to a monitoring platform, this event indicates that the antimalware platform is running and in a healthy state.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender client is up and running in a healthy state.</p>
-<dl>
-<dt>Platform Version: </dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. The Windows Defenderclient is in a healthy state. This event is reported on an hourly basis.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2000</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_UPDATED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware definitions updated successfully.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender signature version has been updated.</p>
-<dl>
-<dt>Current Signature Version: </dt>
-<dt>Previous Signature Version:</dt>
-<dt>Signature Type:</dt>
-<dt>Update Type:</dt>
-<dt>User:</dt>
-<dt>Current Engine Version:</dt>
-<dt>Previous Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. The Windows Defender client is in a healthy state. This event is reported when signatures are successfully updated.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2001</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_UPDATE_FAILED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware definition update failed. 
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to update signatures.</p>
-<dl>
-<dt>New Signature Version: </dt>
-<dt>Previous Signature Version:</dt>
-<dt>Update Source:</dt>
-<dt>Update Stage:</dt>
-<dt>Source Path:</dt>
-<dt>Signature Type:</dt>
-<dt>Update Type:</dt>
-<dt>User:</dt>
-<dt>Current Engine Version:</dt>
-<dt>Previous Engine Version:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>This error occurs when there is a problem updating definitions.</p>
-<p>To troubleshoot this event:
-<ol>
-<li>Update the definitions. Either:<ol>
-<li>Click the <b>Update definitions</b> button on the <b>Update</b> tab in Windows Defender. <img src="images/defender-updatedefs.png" alt="Update definitions in Windows Defender"/><p>Or,</p>
-</li>
-<li>Download the latest definitions from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a>.
 
-<p>Note: The size of the definitions file downloaded from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a> can exceed 60 MB and should not be used as a long-term solution for updating definitions.</p>
-</li>
-</ol>
-</li>
-<li>Review the entries in the %Windir%\WindowsUpdate.log file for more information about this error.</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2002</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ENGINE_UPDATED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine updated successfully.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender engine version has been updated.</p>
-<dl>
-<dt>Current Engine Version:</dt>
-<dt>Previous Engine Version:</dt>
-<dt>Engine Type:</dt>
-<dt>User:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. The Windows Defender client is in a healthy state. This event is reported when the antimalware engine is successfully updated.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2003</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ENGINE_UPDATE_FAILED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine update failed.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to update the engine.</p>
-<dl>
-<dt>New Engine Version:</dt>
-<dt>Previous Engine Version:</dt>
-<dt>Engine Type:</dt>
-<dt>User:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The Windows Defender client update failed. This event occurs when the client fails to update itself. This event is usually due to an interruption in network connectivity during an update.</p>
-<p>To troubleshoot this event:
-<ol>
-<li>Update the definitions. Either:<ol>
-<li>Click the <b>Update definitions</b> button on the <b>Update</b> tab in Windows Defender. <img src="images/defender-updatedefs.png" alt="Update definitions in Windows Defender"/><p>Or,</p>
-</li>
-<li>Download the latest definitions from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a>.
+ 
 
-<p>Note: The size of the definitions file downloaded from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a> can exceed 60 MB and should not be used as a long-term solution for updating definitions.</p>
-</li>
-</ol>
-</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2004</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_REVERSION</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>There was a problem loading antimalware definitions. The antimalware engine will attempt to load the last-known good set of definitions.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to load signatures and will attempt reverting back to a known-good set of signatures.</p>
-<dl>
-<dt>Signatures Attempted:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Signature Version:</dt>
-<dt>Engine Version: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The Windows Defender client attempted to download and install the latest definitions file and failed. This error can occur when the client encounters an error while trying to load the definitions, or if the file is corrupt. Windows Defender will attempt to revert back to a known-good set of definitions.</p>
-<p>To troubleshoot this event:
-<ol>
-<li>Restart the computer and try again.</li>
-<li>Download the latest definitions from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a>.
+If this event persists:
 
-<p>Note: The size of the definitions file downloaded from the <a href="http://go.microsoft.com/fwlink/?LinkID=200965">Microsoft Malware Protection Center</a> can exceed 60 MB and should not be used as a long-term solution for updating definitions.</p>
-</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2005</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ENGINE_UPDATE_PLATFORMOUTOFDATE</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine failed to load because the antimalware platform is out of date. The antimalware platform will load the last-known good antimalware engine and attempt to update.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender could not load antimalware engine because current platform version is not supported. Windows Defender will revert back to the last known-good engine and a platform update will be attempted.</p>
-<dl>
-<dt>Current Platform Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2006</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_PLATFORM_UPDATE_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The platform update failed.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to update the platform.</p>
-<dl>
-<dt>Current Platform Version:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2007</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_PLATFORM_ALMOSTOUTOFDATE</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The platform will soon be out of date. Download the latest platform to maintain up-to-date protection.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender will soon require a newer platform version to support future versions of the antimalware engine. Download the latest Windows Defender platform to maintain the best level of protection available.</p>
-<dl>
-<dt>Current Platform Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2010</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_FASTPATH_UPDATED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine used the Dynamic Signature Service to get additional definitions.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender used <i>Dynamic Signature Service</i> to retrieve additional signatures to help protect your machine.</p>
-<dl>
-<dt>Current Signature Version: </dt>
-<dt>Signature Type:</dt>
-<dt>Current Engine Version:</dt>
-<dt>Dynamic Signature Type: </dt>
-<dt>Persistence Path:</dt>
-<dt>Dynamic Signature Version:</dt>
-<dt>Dynamic Signature Compilation Timestamp:</dt>
-<dt>Persistence Limit Type:</dt>
-<dt>Persistence Limit:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2011</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_FASTPATH_DELETED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The Dynamic Signature Service deleted the out-of-date dynamic definitions.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender used <i>Dynamic Signature Service</i> to discard obsolete signatures.</p>
-<dl>
-<dt>Current Signature Version: </dt>
-<dt>Signature Type:</dt>
-<dt>Current Engine Version:</dt>
-<dt>Dynamic Signature Type: </dt>
-<dt>Persistence Path:</dt>
-<dt>Dynamic Signature Version:</dt>
-<dt>Dynamic Signature Compilation Timestamp:</dt>
-<dt>Removal Reason:</dt>
-<dt>Persistence Limit Type:</dt>
-<dt>Persistence Limit:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>No action is necessary. The Windows Defender client is in a healthy state. This event is reported when the Dynamic Signature Service successfully deletes out-of-date dynamic definitions.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2012</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_FASTPATH_UPDATE_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine encountered an error when trying to use the Dynamic Signature Service.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to use <i>Dynamic Signature Service</i>.</p>
-<dl>
-<dt>Current Signature Version: </dt>
-<dt>Signature Type:</dt>
-<dt>Current Engine Version:</dt>
-<dt>Error Code: </dt>
-<dt>Error Description:</dt>
-<dt>Dynamic Signature Type: </dt>
-<dt>Persistence Path:</dt>
-<dt>Dynamic Signature Version:</dt>
-<dt>Dynamic Signature Compilation Timestamp:</dt>
-<dt>Persistence Limit Type:</dt>
-<dt>Persistence Limit:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>Check your Internet connectivity settings.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2013</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_SIGNATURE_FASTPATH_DELETED_ALL
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The Dynamic Signature Service deleted all dynamic definitions.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender discarded all <i>Dynamic Signature Service</i> signatures.</p>
-<dl>
-<dt>Current Signature Version: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2020</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_CLOUD_CLEAN_RESTORE_FILE_DOWNLOADED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine downloaded a clean file.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender downloaded a clean file.</p>
-<dl>
-<dt>Filename:</dt>
-<dt>Current Signature Version: </dt>
-<dt>Current Engine Version:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 2021</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_CLOUD_CLEAN_RESTORE_FILE_DOWNLOAD_FAILED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine failed to download a clean file.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to download a clean file.</p>
-<dl>
-<dt>Filename:</dt>
-<dt>Current Signature Version: </dt>
-<dt>Current Engine Version:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>Check your Internet connectivity settings.
-</p>
-<p>The Windows Defender client encountered an error when using the Dynamic Signature Service to download the latest definitions to a specific threat. This error is likely caused by a network connectivity issue. 
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2030</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_OFFLINE_SCAN_INSTALLED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine was downloaded and is configured to run offline on the next system restart.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender downloaded and configured Windows Defender Offline to run on the next reboot.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2031</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_OFFLINE_SCAN_INSTALL_FAILED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine was unable to download and configure an offline scan.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender has encountered an error trying to download and configure Windows Defender Offline.</p>
-<dl>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2040</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_OS_EXPIRING
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Antimalware support for this operating system version will soon end.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>The support for your operating system will expire shortly. Running Windows Defender on an out of support operating system is not an adequate solution to protect against threats.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2041</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_OS_EOL
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Antimalware support for this operating system has ended. You must upgrade the operating system for continued support.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>The support for your operating system has expired. Running Windows Defender on an out of support operating system is not an adequate solution to protect against threats.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 2042</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_PROTECTION_EOL
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine no longer supports this operating system, and is no longer protecting your system from malware.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>The support for your operating system has expired. Windows Defender is no longer supported on your operating system, has stopped functioning, and is not protecting against malware threats.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 3002</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_RTP_FEATURE_FAILURE
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Real-time protection encountered an error and failed.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender Real-Time Protection feature has encountered an error and failed.</p>
-<dl>
-<dt>Feature:</dt>
-<dt>Error Code:</dt>
-<dt>Error Description:</dt>
-<dt>Reason: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>You should restart the system then run a full scan because it’s possible the system was not protected for some time.
-</p>
-<p>The Windows Defender client’s real-time protection feature encountered an error because one of the services failed to start. 
-</p>
-<p>If it is followed by a 3007 event ID, the failure was temporary and the antimalware client recovered from the failure. 
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="4">Event ID: 3007</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_RTP_FEATURE_RECOVERED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Real-time protection recovered from a failure. We recommend running a full system scan when you see this error.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender Real-time Protection has restarted a feature. It is recommended that you run a full system scan to detect any items that may have been missed while this agent was down.</p>
-<dl>
-<dt>Feature:</dt>
-<dt>Reason: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The real-time protection feature has restarted. If this event happens again, contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>. </p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5000</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_RTP_ENABLED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Real-time protection is enabled.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender Real-time Protection scanning for malware and other potentially unwanted software was enabled.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5001</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_RTP_DISABLED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Real-time protection is disabled.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender Real-time Protection scanning for malware and other potentially unwanted software was disabled. </p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5004</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_RTP_FEATURE_CONFIGURED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The real-time protection configuration changed.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender Real-time Protection feature configuration has changed.</p>
-<dl>
-<dt>Feature:</dt>
-<dt>Configuration: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5007</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_CONFIG_CHANGED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform configuration changed.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender Configuration has changed. If this is an unexpected event you should review the settings as this may be the result of malware.</p>
-<dl>
-<dt>Old value:</dt>
-<dt>New value: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="5">Event ID: 5008</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ENGINE_FAILURE</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware engine encountered an error and failed.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender  engine has been terminated due to an unexpected error.</p>
-<dl>
-<dt>Failure Type:</dt>
-<dt>Exception Code: </dt>
-<dt>Resource:</dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>To troubleshoot this event:<ol>
-<li>Try to restart the service.<ul>
-<li>For antimalware, antivirus and spyware, at an elevated command prompt, type <b>net stop msmpsvc</b>, and then type <b>net start msmpsvc</b> to restart the antimalware engine.</li>
-<li>For the <i>Network Inspection System</i>, at an elevated command prompt, type <b>net start nissrv</b>, and then type <b>net start nissrv</b> to restart the <i>Network Inspection System</i> engine by using the NiSSRV.exe file.
+1.  Run the scan again.
+2.  If it fails in the same way, go to the [Microsoft Support site](http://go.microsoft.com/fwlink/?LinkId=215163), enter the error number in the **Search** box to look for the error code.
+3.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 1120
+Symbolic name:
+
+**MALWAREPROTECTION\_THREAT\_HASH**
+
+Message:
+
+**Windows Defender has deduced the hashes for a threat resource.**
+
+Description:
+
+Windows Defender client is up and running in a healthy state.
+
+Current Platform Version:
+Threat Resource Path:
+Hashes:
+**Note**  This event will only be logged if the following policy is set: **ThreatFileHashLogging unsigned**.
+
+ 
+
+Event ID: 1150
+Symbolic name:
+
+**MALWAREPROTECTION\_SERVICE\_HEALTHY**
+
+Message:
+
+**If your antimalware platform reports status to a monitoring platform, this event indicates that the antimalware platform is running and in a healthy state.**
+
+Description:
+
+Windows Defender client is up and running in a healthy state.
+
+Platform Version:
+Signature Version:
+Engine Version:
+User action:
+
+No action is necessary. The Windows Defenderclient is in a healthy state. This event is reported on an hourly basis.
+
+Event ID: 2000
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_UPDATED**
+
+Message:
+
+**The antimalware definitions updated successfully.**
+
+Description:
+
+Windows Defender signature version has been updated.
+
+Current Signature Version:
+Previous Signature Version:
+Signature Type:
+Update Type:
+User:
+Current Engine Version:
+Previous Engine Version:
+User action:
+
+No action is necessary. The Windows Defender client is in a healthy state. This event is reported when signatures are successfully updated.
+
+Event ID: 2001
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_UPDATE\_FAILED**
+
+Message:
+
+**The antimalware definition update failed.**
+
+Description:
+
+Windows Defender has encountered an error trying to update signatures.
+
+New Signature Version:
+Previous Signature Version:
+Update Source:
+Update Stage:
+Source Path:
+Signature Type:
+Update Type:
+User:
+Current Engine Version:
+Previous Engine Version:
+Error Code:
+Error Description:
+User action:
+
+This error occurs when there is a problem updating definitions.
+
+To troubleshoot this event:
+
+1.  Update the definitions. Either:
+    1.  Click the **Update definitions** button on the **Update** tab in Windows Defender. ![update definitions in windows defender](images/defender-updatedefs.png)
+
+        Or,
+
+    2.  Download the latest definitions from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965).
+
+        Note: The size of the definitions file downloaded from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965) can exceed 60 MB and should not be used as a long-term solution for updating definitions.
+
+2.  Review the entries in the %Windir%\\WindowsUpdate.log file for more information about this error.
+3.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 2002
+Symbolic name:
+
+**MALWAREPROTECTION\_ENGINE\_UPDATED**
+
+Message:
+
+**The antimalware engine updated successfully.**
+
+Description:
+
+Windows Defender engine version has been updated.
+
+Current Engine Version:
+Previous Engine Version:
+Engine Type:
+User:
+User action:
+
+No action is necessary. The Windows Defender client is in a healthy state. This event is reported when the antimalware engine is successfully updated.
+
+Event ID: 2003
+Symbolic name:
+
+**MALWAREPROTECTION\_ENGINE\_UPDATE\_FAILED**
+
+Message:
+
+**The antimalware engine update failed.**
+
+Description:
+
+Windows Defender has encountered an error trying to update the engine.
+
+New Engine Version:
+Previous Engine Version:
+Engine Type:
+User:
+Error Code:
+Error Description:
+User action:
+
+The Windows Defender client update failed. This event occurs when the client fails to update itself. This event is usually due to an interruption in network connectivity during an update.
+
+To troubleshoot this event:
+
+1.  Update the definitions. Either:
+    1.  Click the **Update definitions** button on the **Update** tab in Windows Defender. ![update definitions in windows defender](images/defender-updatedefs.png)
+
+        Or,
+
+    2.  Download the latest definitions from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965).
+
+        Note: The size of the definitions file downloaded from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965) can exceed 60 MB and should not be used as a long-term solution for updating definitions.
+
+2.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 2004
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_REVERSION**
+
+Message:
+
+**There was a problem loading antimalware definitions. The antimalware engine will attempt to load the last-known good set of definitions.**
+
+Description:
+
+Windows Defender has encountered an error trying to load signatures and will attempt reverting back to a known-good set of signatures.
+
+Signatures Attempted:
+Error Code:
+Error Description:
+Signature Version:
+Engine Version:
+User action:
+
+The Windows Defender client attempted to download and install the latest definitions file and failed. This error can occur when the client encounters an error while trying to load the definitions, or if the file is corrupt. Windows Defender will attempt to revert back to a known-good set of definitions.
+
+To troubleshoot this event:
+
+1.  Restart the computer and try again.
+2.  Download the latest definitions from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965).
+
+    Note: The size of the definitions file downloaded from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965) can exceed 60 MB and should not be used as a long-term solution for updating definitions.
+
+3.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 2005
+Symbolic name:
+
+**MALWAREPROTECTION\_ENGINE\_UPDATE\_PLATFORMOUTOFDATE**
+
+Message:
+
+**The antimalware engine failed to load because the antimalware platform is out of date. The antimalware platform will load the last-known good antimalware engine and attempt to update.**
+
+Description:
+
+Windows Defender could not load antimalware engine because current platform version is not supported. Windows Defender will revert back to the last known-good engine and a platform update will be attempted.
+
+Current Platform Version:
+Event ID: 2006
+Symbolic name:
+
+**MALWAREPROTECTION\_PLATFORM\_UPDATE\_FAILED**
+
+Message:
+
+**The platform update failed.**
+
+Description:
+
+Windows Defender has encountered an error trying to update the platform.
+
+Current Platform Version:
+Error Code:
+Error Description:
+Event ID: 2007
+Symbolic name:
+
+**MALWAREPROTECTION\_PLATFORM\_ALMOSTOUTOFDATE**
+
+Message:
+
+**The platform will soon be out of date. Download the latest platform to maintain up-to-date protection.**
+
+Description:
+
+Windows Defender will soon require a newer platform version to support future versions of the antimalware engine. Download the latest Windows Defender platform to maintain the best level of protection available.
+
+Current Platform Version:
+Event ID: 2010
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_FASTPATH\_UPDATED**
+
+Message:
+
+**The antimalware engine used the Dynamic Signature Service to get additional definitions.**
+
+Description:
+
+Windows Defender used *Dynamic Signature Service* to retrieve additional signatures to help protect your machine.
+
+Current Signature Version:
+Signature Type:
+Current Engine Version:
+Dynamic Signature Type:
+Persistence Path:
+Dynamic Signature Version:
+Dynamic Signature Compilation Timestamp:
+Persistence Limit Type:
+Persistence Limit:
+Event ID: 2011
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_FASTPATH\_DELETED**
+
+Message:
+
+**The Dynamic Signature Service deleted the out-of-date dynamic definitions.**
+
+Description:
+
+Windows Defender used *Dynamic Signature Service* to discard obsolete signatures.
+
+Current Signature Version:
+Signature Type:
+Current Engine Version:
+Dynamic Signature Type:
+Persistence Path:
+Dynamic Signature Version:
+Dynamic Signature Compilation Timestamp:
+Removal Reason:
+Persistence Limit Type:
+Persistence Limit:
+User action:
+
+No action is necessary. The Windows Defender client is in a healthy state. This event is reported when the Dynamic Signature Service successfully deletes out-of-date dynamic definitions.
+
+Event ID: 2012
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_FASTPATH\_UPDATE\_FAILED**
+
+Message:
+
+**The antimalware engine encountered an error when trying to use the Dynamic Signature Service.**
+
+Description:
+
+Windows Defender has encountered an error trying to use *Dynamic Signature Service*.
+
+Current Signature Version:
+Signature Type:
+Current Engine Version:
+Error Code:
+Error Description:
+Dynamic Signature Type:
+Persistence Path:
+Dynamic Signature Version:
+Dynamic Signature Compilation Timestamp:
+Persistence Limit Type:
+Persistence Limit:
+User action:
+
+Check your Internet connectivity settings.
+
+Event ID: 2013
+Symbolic name:
+
+**MALWAREPROTECTION\_SIGNATURE\_FASTPATH\_DELETED\_ALL**
+
+Message:
+
+**The Dynamic Signature Service deleted all dynamic definitions.**
+
+Description:
+
+Windows Defender discarded all *Dynamic Signature Service* signatures.
+
+Current Signature Version:
+Event ID: 2020
+Symbolic name:
+
+**MALWAREPROTECTION\_CLOUD\_CLEAN\_RESTORE\_FILE\_DOWNLOADED**
+
+Message:
+
+**The antimalware engine downloaded a clean file.**
+
+Description:
+
+Windows Defender downloaded a clean file.
+
+Filename:
+Current Signature Version:
+Current Engine Version:
+Event ID: 2021
+Symbolic name:
+
+**MALWAREPROTECTION\_CLOUD\_CLEAN\_RESTORE\_FILE\_DOWNLOAD\_FAILED**
+
+Message:
+
+**The antimalware engine failed to download a clean file.**
+
+Description:
+
+Windows Defender has encountered an error trying to download a clean file.
+
+Filename:
+Current Signature Version:
+Current Engine Version:
+Error Code:
+Error Description:
+User action:
+
+Check your Internet connectivity settings.
+
+The Windows Defender client encountered an error when using the Dynamic Signature Service to download the latest definitions to a specific threat. This error is likely caused by a network connectivity issue.
+
+Event ID: 2030
+Symbolic name:
+
+**MALWAREPROTECTION\_OFFLINE\_SCAN\_INSTALLED**
+
+Message:
+
+**The antimalware engine was downloaded and is configured to run offline on the next system restart.**
+
+Description:
+
+Windows Defender downloaded and configured Windows Defender Offline to run on the next reboot.
+
+Event ID: 2031
+Symbolic name:
+
+**MALWAREPROTECTION\_OFFLINE\_SCAN\_INSTALL\_FAILED**
+
+Message:
+
+**The antimalware engine was unable to download and configure an offline scan.**
+
+Description:
+
+Windows Defender has encountered an error trying to download and configure Windows Defender Offline.
+
+Error Code:
+Error Description:
+Event ID: 2040
+Symbolic name:
+
+**MALWAREPROTECTION\_OS\_EXPIRING**
+
+Message:
+
+**Antimalware support for this operating system version will soon end.**
+
+Description:
+
+The support for your operating system will expire shortly. Running Windows Defender on an out of support operating system is not an adequate solution to protect against threats.
+
+Event ID: 2041
+Symbolic name:
+
+**MALWAREPROTECTION\_OS\_EOL**
+
+Message:
+
+**Antimalware support for this operating system has ended. You must upgrade the operating system for continued support.**
+
+Description:
+
+The support for your operating system has expired. Running Windows Defender on an out of support operating system is not an adequate solution to protect against threats.
+
+Event ID: 2042
+Symbolic name:
+
+**MALWAREPROTECTION\_PROTECTION\_EOL**
+
+Message:
+
+**The antimalware engine no longer supports this operating system, and is no longer protecting your system from malware.**
+
+Description:
+
+The support for your operating system has expired. Windows Defender is no longer supported on your operating system, has stopped functioning, and is not protecting against malware threats.
+
+Event ID: 3002
+Symbolic name:
+
+**MALWAREPROTECTION\_RTP\_FEATURE\_FAILURE**
+
+Message:
+
+**Real-time protection encountered an error and failed.**
+
+Description:
+
+Windows Defender Real-Time Protection feature has encountered an error and failed.
+
+Feature:
+Error Code:
+Error Description:
+Reason:
+User action:
+
+You should restart the system then run a full scan because it’s possible the system was not protected for some time.
+
+The Windows Defender client’s real-time protection feature encountered an error because one of the services failed to start.
+
+If it is followed by a 3007 event ID, the failure was temporary and the antimalware client recovered from the failure.
+
+Event ID: 3007
+Symbolic name:
+
+**MALWAREPROTECTION\_RTP\_FEATURE\_RECOVERED**
+
+Message:
+
+**Real-time protection recovered from a failure. We recommend running a full system scan when you see this error.**
+
+Description:
+
+Windows Defender Real-time Protection has restarted a feature. It is recommended that you run a full system scan to detect any items that may have been missed while this agent was down.
+
+Feature:
+Reason:
+User action:
+
+The real-time protection feature has restarted. If this event happens again, contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 5000
+Symbolic name:
+
+**MALWAREPROTECTION\_RTP\_ENABLED**
+
+Message:
+
+**Real-time protection is enabled.**
+
+Description:
+
+Windows Defender Real-time Protection scanning for malware and other potentially unwanted software was enabled.
+
+Event ID: 5001
+Symbolic name:
+
+**MALWAREPROTECTION\_RTP\_DISABLED**
+
+Message:
+
+**Real-time protection is disabled.**
+
+Description:
+
+Windows Defender Real-time Protection scanning for malware and other potentially unwanted software was disabled.
+
+Event ID: 5004
+Symbolic name:
+
+**MALWAREPROTECTION\_RTP\_FEATURE\_CONFIGURED**
+
+Message:
+
+**The real-time protection configuration changed.**
+
+Description:
+
+Windows Defender Real-time Protection feature configuration has changed.
+
+Feature:
+Configuration:
+Event ID: 5007
+Symbolic name:
+
+**MALWAREPROTECTION\_CONFIG\_CHANGED**
+
+Message:
+
+**The antimalware platform configuration changed.**
+
+Description:
+
+Windows Defender Configuration has changed. If this is an unexpected event you should review the settings as this may be the result of malware.
+
+Old value:
+New value:
+Event ID: 5008
+Symbolic name:
+
+**MALWAREPROTECTION\_ENGINE\_FAILURE**
+
+Message:
+
+**The antimalware engine encountered an error and failed.**
+
+Description:
+
+Windows Defender engine has been terminated due to an unexpected error.
+
+Failure Type:
+Exception Code:
+Resource:
+User action:
+
+To troubleshoot this event:
+
+1.  Try to restart the service.
+    -   For antimalware, antivirus and spyware, at an elevated command prompt, type **net stop msmpsvc**, and then type **net start msmpsvc** to restart the antimalware engine.
+    -   For the *Network Inspection System*, at an elevated command prompt, type **net start nissrv**, and then type **net start nissrv** to restart the *Network Inspection System* engine by using the NiSSRV.exe file.
+
+2.  If it fails in the same way, look up the error code by accessing the [Microsoft Support Site](http://go.microsoft.com/fwlink/?LinkId=215163) and entering the error number in the **Search** box, and contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+User action:
+
+The Windows Defender client engine stopped due to an unexpected error.
+
+To troubleshoot this event:
+
+1.  Run the scan again.
+2.  If it fails in the same way, go to the [Microsoft Support site](http://go.microsoft.com/fwlink/?LinkId=215163), enter the error number in the **Search** box to look for the error code.
+3.  Contact [Microsoft Technical Support](http://go.microsoft.com/fwlink/?LinkId=215491).
+
+Event ID: 5009
+Symbolic name:
+
+**MALWAREPROTECTION\_ANTISPYWARE\_ENABLED**
+
+Message:
+
+**Scanning for malware and other potentially unwanted software is enabled.**
+
+Description:
+
+Windows Defender scanning for malware and other potentially unwanted software has been enabled.
+
+Event ID: 5010
+Symbolic name:
+
+**MALWAREPROTECTION\_ANTISPYWARE\_DISABLED**
+
+Message:
+
+**Scanning for malware and other potentially unwanted software is disabled.**
+
+Description:
+
+Windows Defender scanning for malware and other potentially unwanted software is disabled.
+
+Event ID: 5011
+Symbolic name:
+
+**MALWAREPROTECTION\_ANTIVIRUS\_ENABLED**
+
+Message:
+
+**Scanning for viruses is enabled.**
+
+Description:
+
+Windows Defender scanning for viruses has been enabled.
+
+Event ID: 5012
+Symbolic name:
+
+**MALWAREPROTECTION\_ANTIVIRUS\_DISABLED**
+
+Message:
+
+**Scanning for viruses is disabled.**
+
+Description:
+
+Windows Defender scanning for viruses is disabled.
+
+Event ID: 5100
+Symbolic name:
+
+**MALWAREPROTECTION\_EXPIRATION\_WARNING\_STATE**
+
+Message:
+
+**The antimalware platform will expire soon.**
+
+Description:
+
+Windows Defender has entered a grace period and will soon expire. After expiration, this program will disable protection against viruses, spyware, and other potentially unwanted software.
+
+Expiration Reason:
+Expiration Date:
+Event ID: 5101
+Symbolic name:
+
+**MALWAREPROTECTION\_DISABLED\_EXPIRED\_STATE**
+
+Message:
+
+**The antimalware platform is expired.**
+
+Description::
+
+Windows Defender grace period has expired. Protection against viruses, spyware, and other potentially unwanted software is disabled.
+
+Expiration Reason:
+Expiration Date:
+Error Code:
+Error Description:
+ 
+
+## Windows Defender client error codes
 
 
+If Windows Defender experiences any issues it will usually give you an error code to help you troubleshoot the issue. Most often an error means there was a problem installing an update.
 
-</li>
-</ul>
-</li>
-<li>If it fails in the same way, look up the error code by accessing the <a href="http://go.microsoft.com/fwlink/?LinkId=215163">Microsoft Support Site</a>  and entering the error number in the <b>Search</b> box, and contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>User action:</p>
-</td>
-<td>
-<p>The Windows Defender client engine stopped due to an unexpected error.</p>
-<p>To troubleshoot this event:
-<ol>
-<li>Run the scan again.</li>
-<li>If it fails in the same way, go to the <a href="http://go.microsoft.com/fwlink/?LinkId=215163">Microsoft Support site</a>, enter the error number in the <b>Search</b> box to look for the error code.</li>
-<li>Contact <a href="http://go.microsoft.com/fwlink/?LinkId=215491">Microsoft Technical Support</a>.
-</li>
-</ol>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5009</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ANTISPYWARE_ENABLED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Scanning for malware and other potentially unwanted software is enabled.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender scanning for malware and other potentially unwanted software has been enabled.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5010</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ANTISPYWARE_DISABLED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Scanning for malware and other potentially unwanted software is disabled.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender scanning for malware and other potentially unwanted software is disabled.</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5011</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ANTIVIRUS_ENABLED</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Scanning for viruses is enabled.</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender scanning for viruses has been enabled. </p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5012</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_ANTIVIRUS_DISABLED
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>Scanning for viruses is disabled.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>Windows Defender scanning for viruses is disabled. </p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5100</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_EXPIRATION_WARNING_STATE
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform will expire soon.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description:</p>
-</td>
-<td>
-<p>
-<p>Windows Defender  has entered a grace period and will soon expire. After expiration, this program will disable protection against viruses, spyware, and other potentially unwanted software.</p>
-<dl>
-<dt>Expiration Reason:</dt>
-<dt>Expiration Date: </dt>
-</dl>
-</p>
-</td>
-</tr>
-<tr>
-<th rowspan="3">Event ID: 5101</th>
-<td>
-<p>Symbolic name:</p>
-</td>
-<td>
-<p><b>MALWAREPROTECTION_DISABLED_EXPIRED_STATE
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Message:</p>
-</td>
-<td>
-<p><b>The antimalware platform is expired.
-</b></p>
-</td>
-</tr>
-<tr>
-<td>
-<p>Description::</p>
-</td>
-<td>
-<p>
-<p>Windows Defender  grace period has expired. Protection against viruses, spyware, and other potentially unwanted software is disabled.</p>
-<dl>
-<dt>Expiration Reason:</dt>
-<dt>Expiration Date: </dt>
-<dt>Error Code:</dt>
-<dt>Error Description: </dt>
-</dl>
-</p>
-</td>
-</tr>
-</table> 
+This section provides the following information about Windows Defender client errors.
+
+-   The error code
+-   The possible reason for the error
+-   Advice on what to do now
+
+Use the information in these tables to help troubleshoot Windows Defender error codes.
+
+External error codes
+Error code
+Message displayed
+Possible reason for error
+What to do now
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+xxxx
+
+ 
+
+Internal error codes
+Error code
+Message displayed
+Possible reason for error
+What to do now
+0x80501000
+
+**ERROR\_MP\_UI\_CONSOLIDATION\_BAS**E
+
+This is an internal error. The cause is not clearly defined.
+
+1.  Update the definitions. Either:
+    1.  Click the **Update definitions** button on the **Update** tab in Windows Defender. ![update definitions in windows defender](images/defender-updatedefs.png)
+
+        Or,
+
+    2.  Download the latest definitions from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965).
+
+        Note: The size of the definitions file downloaded from the [Microsoft Malware Protection Center](http://go.microsoft.com/fwlink/?LinkID=200965) can exceed 60 MB and should not be used as a long-term solution for updating definitions.
+
+2.  Run a full scan.
+3.  Restart the device and try again.
+
+0x80501001
+
+**ERROR\_MP\_ACTIONS\_FAILED**
+
+0x80501002
+
+**ERROR\_MP\_NOENGINE**
+
+0x80501003
+
+**ERROR\_MP\_ACTIVE\_THREATS**
+
+0x805011011
+
+**MP\_ERROR\_CODE\_LUA\_CANCELLED**
+
+0x80501101
+
+**ERROR\_LUA\_CANCELLATION**
+
+0x80501102
+
+**MP\_ERROR\_CODE\_ALREADY\_SHUTDOWN**
+
+0x80501103
+
+**MP\_ERROR\_CODE\_RDEVICE\_S\_ASYNC\_CALL\_PENDING**
+
+0x80501104
+
+**MP\_ERROR\_CODE\_CANCELLED**
+
+0x80501105
+
+**MP\_ERROR\_CODE\_NO\_TARGETOS**
+
+0x80501106
+
+**MP\_ERROR\_CODE\_BAD\_REGEXP**
+
+0x80501107
+
+**MP\_ERROR\_TEST\_INDUCED\_ERROR**
+
+0x80501108
+
+**MP\_ERROR\_SIG\_BACKUP\_DISABLED**
+
+0x80508001
+
+**ERR\_MP\_BAD\_INIT\_MODULES**
+
+0x80508002
+
+**ERR\_MP\_BAD\_DATABASE**
+
+0x80508004
+
+**ERR\_MP\_BAD\_UFS**
+
+0x8050800C
+
+**ERR\_MP\_BAD\_INPUT\_DATA**
+
+0x8050800D
+
+**ERR\_MP\_BAD\_GLOBAL\_STORAGE**
+
+0x8050800E
+
+**ERR\_MP\_OBSOLETE**
+
+0x8050800F
+
+**ERR\_MP\_NOT\_SUPPORTED**
+
+0x8050800F 0x80508010
+
+**ERR\_MP\_NO\_MORE\_ITEMS**
+
+0x80508011
+
+**ERR\_MP\_DUPLICATE\_SCANID**
+
+0x80508012
+
+**ERR\_MP\_BAD\_SCANID**
+
+0x80508013
+
+**ERR\_MP\_BAD\_USERDB\_VERSION**
+
+0x80508014
+
+**ERR\_MP\_RESTORE\_FAILED**
+
+0x80508016
+
+**ERR\_MP\_BAD\_ACTION**
+
+0x80508019
+
+**ERR\_MP\_NOT\_FOUND**
+
+0x80509001
+
+**ERR\_RELO\_BAD\_EHANDLE**
+
+0x80509003
+
+**ERR\_RELO\_KERNEL\_NOT\_LOADED**
+
+0x8050A001
+
+**ERR\_MP\_BADDB\_OPEN**
+
+0x8050A002
+
+**ERR\_MP\_BADDB\_HEADER**
+
+0x8050A003
+
+**ERR\_MP\_BADDB\_OLDENGINE**
+
+0x8050A004
+
+**ERR\_MP\_BADDB\_CONTENT**
+
+0x8050A005
+
+**ERR\_MP\_BADDB\_NOTSIGNED**
+
+ 
 
 ## Related topics
 
diff --git a/windows/keep-secure/trusted-platform-module--tpm-2-0--.md b/windows/keep-secure/trusted-platform-module--tpm-2-0--.md
index a1354f808a..82168aa9c3 100644
--- a/windows/keep-secure/trusted-platform-module--tpm-2-0--.md
+++ b/windows/keep-secure/trusted-platform-module--tpm-2-0--.md
@@ -1,7 +1,6 @@
 ---
 title: TPM recommendations (Windows 10)
 description: This topic provides recommendations for Trusted Platform Module (TPM) technology for Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: E85F11F5-4E6A-43E7-8205-672F77706561
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -19,17 +18,6 @@ author: brianlic-msft
 -   Windows Server 2016 Technical Preview
 -   Windows 10 IoT Core (IoT Core)
 
-**In this article**
-
--   [Overview](#overview)
--   [TPM 1.2 vs. 2.0 comparison](#tpm-1-2-vs--2-0-comparison)
--   [Why TPM 2.0?](#why-tpm-2-0-)
--   [Discrete or firmware TPM?](#discrete-or-firmware-tpm-)
--   [TPM 2.0 Compliance for Windows 10 in the future](#tpm-2-0-compliance-for-windows-10-in-the-future)
--   [TPM and Windows Features](#tpm-and-windows-features)
--   [Chipset options for TPM 2.0](#chipset-options-for-tpm-2-0)
--   [OEM Feedback and Status on TPM 2.0 system availability](#oem-feedback-and-status-on-tpm-2-0-system-availability)
-
 This topic provides recommendations for Trusted Platform Module (TPM) technology for Windows 10.
 
 ## Overview
diff --git a/windows/keep-secure/trusted-platform-module-services-group-policy-settings.md b/windows/keep-secure/trusted-platform-module-services-group-policy-settings.md
index 681b3a7abd..b0a0d91b86 100644
--- a/windows/keep-secure/trusted-platform-module-services-group-policy-settings.md
+++ b/windows/keep-secure/trusted-platform-module-services-group-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: TPM Group Policy settings (Windows 10)
 description: This topic for the IT professional describes the Trusted Platform Module (TPM) Services that can be controlled centrally by using Group Policy settings.
-MSHAttr: PreferredLib /library
 ms.assetid: 54ff1c1e-a210-4074-a44e-58fee26e4dbd
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/trusted-platform-module-technology-overview.md b/windows/keep-secure/trusted-platform-module-technology-overview.md
index c39c894ce0..d8b99558cc 100644
--- a/windows/keep-secure/trusted-platform-module-technology-overview.md
+++ b/windows/keep-secure/trusted-platform-module-technology-overview.md
@@ -1,7 +1,6 @@
 ---
 title: Trusted Platform Module Technology Overview (Windows 10)
 description: This topic for the IT professional describes the Trusted Platform Module (TPM) and how Windows uses it for access control and authentication. The topic provides links to other resources about the TPM.
-MSHAttr: PreferredLib /library
 ms.assetid: face8932-b034-4319-86ac-db1163d46538
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/types-of-attacks-for-volume-encryption-keys.md b/windows/keep-secure/types-of-attacks-for-volume-encryption-keys.md
index 64f81df453..8c4587f8da 100644
--- a/windows/keep-secure/types-of-attacks-for-volume-encryption-keys.md
+++ b/windows/keep-secure/types-of-attacks-for-volume-encryption-keys.md
@@ -1,7 +1,6 @@
 ---
 title: Types of attacks for volume encryption keys (Windows 10)
-description: There are many ways Windows helps protect your organization from attacks including Unified Extensible Firmware Interface (UEFI) secure boot Trusted Platform Module (TPM) Group Policy complex passwords and account lockouts.
-MSHAttr: PreferredLib /library
+description: There are many ways Windows helps protect your organization from attacks, including Unified Extensible Firmware Interface (UEFI) secure boot, Trusted Platform Module (TPM), Group Policy, complex passwords, and account lockouts.
 ms.assetid: 405060a9-2009-44fc-9f84-66edad32c6bc
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understand-applocker-enforcement-settings.md b/windows/keep-secure/understand-applocker-enforcement-settings.md
index a4427f238f..7b977fc57a 100644
--- a/windows/keep-secure/understand-applocker-enforcement-settings.md
+++ b/windows/keep-secure/understand-applocker-enforcement-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Understand AppLocker enforcement settings (Windows 10)
 description: This topic describes the AppLocker enforcement settings for rule collections.
-MSHAttr: PreferredLib /library
 ms.assetid: 48773007-a343-40bf-8961-b3ff0a450d7e
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understand-applocker-policy-design-decisions.md b/windows/keep-secure/understand-applocker-policy-design-decisions.md
index 398de6895c..d34824f7d7 100644
--- a/windows/keep-secure/understand-applocker-policy-design-decisions.md
+++ b/windows/keep-secure/understand-applocker-policy-design-decisions.md
@@ -1,7 +1,6 @@
 ---
 title: Understand AppLocker policy design decisions (Windows 10)
-description: This topic for the IT professional lists the design questions possible answers and ramifications of the decisions when you plan a deployment of application control policies by using AppLocker within a Windows operating system environment.
-MSHAttr: PreferredLib /library
+description: This topic for the IT professional lists the design questions, possible answers, and ramifications of the decisions when you plan a deployment of application control policies by using AppLocker within a Windows operating system environment.
 ms.assetid: 3475def8-949a-4b51-b480-dc88b5c1e6e6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md b/windows/keep-secure/understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md
index 583a5591eb..ac54fef39f 100644
--- a/windows/keep-secure/understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md
+++ b/windows/keep-secure/understand-applocker-rules-and-enforcement-setting-inheritance-in-group-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Understand AppLocker rules and enforcement setting inheritance in Group Policy (Windows 10)
 description: This topic for the IT professional describes how application control policies configured in AppLocker are applied through Group Policy.
-MSHAttr: PreferredLib /library
 ms.assetid: c1c5a3d3-540a-4698-83b5-0dab5d27d871
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understand-the-applocker-policy-deployment-process.md b/windows/keep-secure/understand-the-applocker-policy-deployment-process.md
index 87d621f640..71a486b003 100644
--- a/windows/keep-secure/understand-the-applocker-policy-deployment-process.md
+++ b/windows/keep-secure/understand-the-applocker-policy-deployment-process.md
@@ -1,7 +1,6 @@
 ---
 title: Understand the AppLocker policy deployment process (Windows 10)
 description: This planning and deployment topic for the IT professional describes the process for using AppLocker when deploying application control policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 4cfd95c1-fbd3-41fa-8efc-d23c1ea6fb16
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-allow-and-deny-actions-on-rules.md b/windows/keep-secure/understanding-applocker-allow-and-deny-actions-on-rules.md
index 672157dcc8..aba279a4c9 100644
--- a/windows/keep-secure/understanding-applocker-allow-and-deny-actions-on-rules.md
+++ b/windows/keep-secure/understanding-applocker-allow-and-deny-actions-on-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker allow and deny actions on rules (Windows 10)
 description: This topic explains the differences between allow and deny actions on AppLocker rules.
-MSHAttr: PreferredLib /library
 ms.assetid: ea0370fa-2086-46b5-a0a4-4a7ead8cbed9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-default-rules.md b/windows/keep-secure/understanding-applocker-default-rules.md
index 76786c2b8b..8cfd4ceadc 100644
--- a/windows/keep-secure/understanding-applocker-default-rules.md
+++ b/windows/keep-secure/understanding-applocker-default-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker default rules (Windows 10)
 description: This topic for IT professional describes the set of rules that can be used to ensure that required Windows system files are allowed to run when the policy is applied.
-MSHAttr: PreferredLib /library
 ms.assetid: bdb03d71-05b7-41fb-96e3-a289ce1866e1
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-rule-behavior.md b/windows/keep-secure/understanding-applocker-rule-behavior.md
index e97d2f5095..e641befe4b 100644
--- a/windows/keep-secure/understanding-applocker-rule-behavior.md
+++ b/windows/keep-secure/understanding-applocker-rule-behavior.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker rule behavior (Windows 10)
 description: This topic describes how AppLocker rules are enforced by using the allow and deny options in AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 3e2738a3-8041-4095-8a84-45c1894c97d0
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-rule-collections.md b/windows/keep-secure/understanding-applocker-rule-collections.md
index 08e1f90f0d..a6f772c351 100644
--- a/windows/keep-secure/understanding-applocker-rule-collections.md
+++ b/windows/keep-secure/understanding-applocker-rule-collections.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker rule collections (Windows 10)
 description: This topic explains the five different types of AppLocker rules used to enforce AppLocker policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 03c05466-4fb3-4880-8d3c-0f6f59fc5579
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-rule-condition-types.md b/windows/keep-secure/understanding-applocker-rule-condition-types.md
index e2c265fdb5..6969952dce 100644
--- a/windows/keep-secure/understanding-applocker-rule-condition-types.md
+++ b/windows/keep-secure/understanding-applocker-rule-condition-types.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker rule condition types (Windows 10)
 description: This topic for the IT professional describes the three types of AppLocker rule conditions.
-MSHAttr: PreferredLib /library
 ms.assetid: c21af67f-60a1-4f7d-952c-a6f769c74729
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-applocker-rule-exceptions.md b/windows/keep-secure/understanding-applocker-rule-exceptions.md
index 8f00f2ff16..a5a24f0b8f 100644
--- a/windows/keep-secure/understanding-applocker-rule-exceptions.md
+++ b/windows/keep-secure/understanding-applocker-rule-exceptions.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding AppLocker rule exceptions (Windows 10)
 description: This topic describes the result of applying AppLocker rule exceptions to rule collections.
-MSHAttr: PreferredLib /library
 ms.assetid: e6bb349f-ee60-4c8d-91cd-6442f2d0eb9c
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-the-file-hash-rule-condition-in-applocker.md b/windows/keep-secure/understanding-the-file-hash-rule-condition-in-applocker.md
index bc18a1ffb0..d014968a92 100644
--- a/windows/keep-secure/understanding-the-file-hash-rule-condition-in-applocker.md
+++ b/windows/keep-secure/understanding-the-file-hash-rule-condition-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding the file hash rule condition in AppLocker (Windows 10)
-description: This topic explains the AppLocker file hash rule condition the advantages and disadvantages and how it is applied.
-MSHAttr: PreferredLib /library
+description: This topic explains the AppLocker file hash rule condition, the advantages and disadvantages, and how it is applied.
 ms.assetid: 4c6d9af4-2b1a-40f4-8758-1a6f9f147756
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-the-path-rule-condition-in-applocker.md b/windows/keep-secure/understanding-the-path-rule-condition-in-applocker.md
index b3821a57b4..80c9494b0b 100644
--- a/windows/keep-secure/understanding-the-path-rule-condition-in-applocker.md
+++ b/windows/keep-secure/understanding-the-path-rule-condition-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding the path rule condition in AppLocker (Windows 10)
-description: This topic explains the AppLocker path rule condition the advantages and disadvantages and how it is applied.
-MSHAttr: PreferredLib /library
+description: This topic explains the AppLocker path rule condition, the advantages and disadvantages, and how it is applied.
 ms.assetid: 3fa54ded-4466-4f72-bea4-2612031cad43
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/understanding-the-publisher-rule-condition-in-applocker.md b/windows/keep-secure/understanding-the-publisher-rule-condition-in-applocker.md
index e5f3180bd3..263db51284 100644
--- a/windows/keep-secure/understanding-the-publisher-rule-condition-in-applocker.md
+++ b/windows/keep-secure/understanding-the-publisher-rule-condition-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding the publisher rule condition in AppLocker (Windows 10)
-description: This topic explains the AppLocker publisher rule condition what controls are available and how it is applied.
-MSHAttr: PreferredLib /library
+description: This topic explains the AppLocker publisher rule condition, what controls are available, and how it is applied.
 ms.assetid: df61ed8f-a97e-4644-9d0a-2169f18c1c4f
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/use-a-reference-computer-to-create-and-maintain-applocker-policies.md b/windows/keep-secure/use-a-reference-computer-to-create-and-maintain-applocker-policies.md
index 650c70c756..ded9affd9c 100644
--- a/windows/keep-secure/use-a-reference-computer-to-create-and-maintain-applocker-policies.md
+++ b/windows/keep-secure/use-a-reference-computer-to-create-and-maintain-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Use a reference device to create and maintain AppLocker policies (Windows 10)
 description: This topic for the IT professional describes the steps to create and maintain AppLocker policies by using a reference computer.
-MSHAttr: PreferredLib /library
 ms.assetid: 10c3597f-f44c-4c8e-8fe5-105d4ac016a6
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/use-applocker-and-software-restriction-policies-in-the-same-domain.md b/windows/keep-secure/use-applocker-and-software-restriction-policies-in-the-same-domain.md
index f44ddb9d90..973405d6cf 100644
--- a/windows/keep-secure/use-applocker-and-software-restriction-policies-in-the-same-domain.md
+++ b/windows/keep-secure/use-applocker-and-software-restriction-policies-in-the-same-domain.md
@@ -1,7 +1,6 @@
 ---
 title: Use AppLocker and Software Restriction Policies in the same domain (Windows 10)
 description: This topic for IT professionals describes concepts and procedures to help you manage your application control strategy using Software Restriction Policies and AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 2b7e0cec-df62-49d6-a2b7-6b8e30180943
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/use-the-applocker-windows-powershell-cmdlets.md b/windows/keep-secure/use-the-applocker-windows-powershell-cmdlets.md
index 1d954d9be8..22eddb11d1 100644
--- a/windows/keep-secure/use-the-applocker-windows-powershell-cmdlets.md
+++ b/windows/keep-secure/use-the-applocker-windows-powershell-cmdlets.md
@@ -1,7 +1,6 @@
 ---
 title: Use the AppLocker Windows PowerShell cmdlets (Windows 10)
 description: This topic for IT professionals describes how each AppLocker Windows PowerShell cmdlet can help you administer your AppLocker application control policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 374e029c-5c0a-44ab-a57a-2a9dd17dc57d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md b/windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
index 4b802e9fa7..ef5fe8f433 100644
--- a/windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
+++ b/windows/keep-secure/use-windows-event-forwarding-to-assist-in-instrusion-detection.md
@@ -1,7 +1,6 @@
 ---
 title: Use Windows Event Forwarding to help with intrusion detection (Windows 10)
 description: 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.
-MSHAttr: PreferredLib /library
 ms.assetid: 733263E5-7FD1-45D2-914A-184B9E3E6A3F
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md b/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
index 87466348eb..84909d2ff2 100644
--- a/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
+++ b/windows/keep-secure/user-account-control-admin-approval-mode-for-the-built-in-administrator-account.md
@@ -1,7 +1,6 @@
 ---
-title: User Account Control Admin Approval Mode for the Built in Administrator account (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Admin Approval Mode for the Built in Administrator account security policy setting.
-MSHAttr: PreferredLib /library
+title: User Account Control Admin Approval Mode for the Built-in Administrator account (Windows 10)
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Admin Approval Mode for the Built-in Administrator account security policy setting.
 ms.assetid: d465fc27-1cd2-498b-9cf6-7ad2276e5998
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Admin Approval Mode for the Built-in Administrator account** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md b/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
index 20ff74128e..3dea249901 100644
--- a/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
+++ b/windows/keep-secure/user-account-control-allow-uiaccess-applications-to-prompt-for-elevation-without-using-the-secure-desktop.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Allow UIAccess applications to prompt for elevation without using the secure desktop (Windows 10)
-description: Describes the best practices location values and security considerations for the User Account Control Allow UIAccess applications to prompt for elevation without using the secure desktop security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, and security considerations for the User Account Control Allow UIAccess applications to prompt for elevation without using the secure desktop security policy setting.
 ms.assetid: fce20472-3c93-449d-b520-13c4c74a9892
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, and security considerations for the **User Account Control: Allow UIAccess applications to prompt for elevation without using the secure desktop** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md b/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
index ea00bd6e47..d60ccc6dc6 100644
--- a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
+++ b/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-administrators-in-admin-approval-mode.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Behavior of the elevation prompt for administrators in Admin Approval Mode (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Behavior of the elevation prompt for administrators in Admin Approval Mode security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Behavior of the elevation prompt for administrators in Admin Approval Mode security policy setting.
 ms.assetid: 46a3c3a2-1d2e-4a6f-b5e6-29f9592f535d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Behavior of the elevation prompt for administrators in Admin Approval Mode** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md b/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
index daab18764c..38d421d5f1 100644
--- a/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
+++ b/windows/keep-secure/user-account-control-behavior-of-the-elevation-prompt-for-standard-users.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Behavior of the elevation prompt for standard users (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Behavior of the elevation prompt for standard users security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Behavior of the elevation prompt for standard users security policy setting.
 ms.assetid: 1eae7def-8f6c-43b6-9474-23911fdc01ba
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Behavior of the elevation prompt for standard users** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md b/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md
index 152eefda57..53b4161dd7 100644
--- a/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md
+++ b/windows/keep-secure/user-account-control-detect-application-installations-and-prompt-for-elevation.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Detect application installations and prompt for elevation (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Detect application installations and prompt for elevation security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Detect application installations and prompt for elevation security policy setting.
 ms.assetid: 3f8cb170-ba77-4c9f-abb3-c3ed1ef264fc
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Detect application installations and prompt for elevation** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md b/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
index fd606fdb2c..94fac9972b 100644
--- a/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
+++ b/windows/keep-secure/user-account-control-only-elevate-executables-that-are-signed-and-validated.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Only elevate executables that are signed and validated (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Only elevate executables that are signed and validated security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Only elevate executables that are signed and validated security policy setting.
 ms.assetid: 64950a95-6985-4db6-9905-1db18557352d
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Only elevate executables that are signed and validated** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md b/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
index c4b3abfb36..c6776e5433 100644
--- a/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
+++ b/windows/keep-secure/user-account-control-only-elevate-uiaccess-applications-that-are-installed-in-secure-locations.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Only elevate UIAccess applications that are installed in secure locations (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Only elevate UIAccess applications that are installed in secure locations security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Only elevate UIAccess applications that are installed in secure locations security policy setting.
 ms.assetid: 4333409e-a5be-4f2f-8808-618f53abd22c
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Only elevate UIAccess applications that are installed in secure locations** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-overview.md b/windows/keep-secure/user-account-control-overview.md
index c210337c70..71d4e00483 100644
--- a/windows/keep-secure/user-account-control-overview.md
+++ b/windows/keep-secure/user-account-control-overview.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control (Windows 10)
-description: User Account Control (UAC) helps prevent malware from damaging a PC and helps organizations deploy a better managed desktop.
-MSHAttr: PreferredLib /library
+description: User Account Control (UAC) helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop.
 ms.assetid: 43ac4926-076f-4df2-84af-471ee7d20c38
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md b/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md
index c0720ad15d..9219e967ee 100644
--- a/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md
+++ b/windows/keep-secure/user-account-control-run-all-administrators-in-admin-approval-mode.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Run all administrators in Admin Approval Mode (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Run all administrators in Admin Approval Mode security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Run all administrators in Admin Approval Mode security policy setting.
 ms.assetid: b838c561-7bfc-41ef-a7a5-55857259c7bf
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Run all administrators in Admin Approval Mode** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-security-policy-settings.md b/windows/keep-secure/user-account-control-security-policy-settings.md
index 3e0250b211..4b14dad1b3 100644
--- a/windows/keep-secure/user-account-control-security-policy-settings.md
+++ b/windows/keep-secure/user-account-control-security-policy-settings.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control security policy settings (Windows 10)
-description: You can use security policies to configure how User Account Control works in your organization. They can be configured locally by using the Local Security Policy snap in (secpol.msc) or configured for the domain OU or specific groups by Group Policy.
-MSHAttr: PreferredLib /library
+description: You can use security policies to configure how User Account Control works in your organization. They can be configured locally by using the Local Security Policy snap-in (secpol.msc) or configured for the domain, OU, or specific groups by Group Policy.
 ms.assetid: 3D75A9AC-69BB-4EF2-ACB3-1769791E1B98
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md b/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
index cd21e7f3ff..e5bebae839 100644
--- a/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
+++ b/windows/keep-secure/user-account-control-switch-to-the-secure-desktop-when-prompting-for-elevation.md
@@ -1,7 +1,6 @@
 ---
 title: User Account Control Switch to the secure desktop when prompting for elevation (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Switch to the secure desktop when prompting for elevation security policy setting.
-MSHAttr: PreferredLib /library
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Switch to the secure desktop when prompting for elevation security policy setting.
 ms.assetid: 77a067db-c70d-4b02-9861-027503311b8b
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Switch to the secure desktop when prompting for elevation** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md b/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
index 9972a6c16d..72e15ea4d5 100644
--- a/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
+++ b/windows/keep-secure/user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations.md
@@ -1,7 +1,6 @@
 ---
-title: User Account Control Virtualize file and registry write failures to per user locations (Windows 10)
-description: Describes the best practices location values policy management and security considerations for the User Account Control Virtualize file and registry write failures to per user locations security policy setting.
-MSHAttr: PreferredLib /library
+title: User Account Control Virtualize file and registry write failures to per-user locations (Windows 10)
+description: Describes the best practices, location, values, policy management and security considerations for the User Account Control Virtualize file and registry write failures to per-user locations security policy setting.
 ms.assetid: a7b47420-cc41-4b1c-b03e-f67a05221261
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,13 +15,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Reference](#reference)
--   [Policy management](#policy-management)
--   [Security considerations](#security-considerations)
--   [Related topics](#related-topics)
-
 Describes the best practices, location, values, policy management and security considerations for the **User Account Control: Virtualize file and registry write failures to per-user locations** security policy setting.
 
 ## Reference
diff --git a/windows/keep-secure/user-rights-assignment.md b/windows/keep-secure/user-rights-assignment.md
index 7d74a62b8c..7b4f1dff2f 100644
--- a/windows/keep-secure/user-rights-assignment.md
+++ b/windows/keep-secure/user-rights-assignment.md
@@ -1,7 +1,6 @@
 ---
 title: User Rights Assignment (Windows 10)
 description: Provides an overview and links to information about the User Rights Assignment security policy settings user rights that are available in Windows.
-MSHAttr: PreferredLib /library
 ms.assetid: 99340252-60be-4c79-b0a5-56fbe1a9b0c5
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md b/windows/keep-secure/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md
index 178375564d..2aac63868b 100644
--- a/windows/keep-secure/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md
+++ b/windows/keep-secure/using-advanced-security-auditing-options-to-monitor-dynamic-access-control-objects.md
@@ -1,7 +1,6 @@
 ---
 title: Using advanced security auditing options to monitor dynamic access control objects (Windows 10)
 description: This guide explains the process of setting up advanced security auditing capabilities that are made possible through settings and events that were introduced in Windows 8 and Windows Server 2012.
-MSHAttr: PreferredLib /library
 ms.assetid: 0d2c28ea-bdaf-47fd-bca2-a07dce5fed37
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/using-event-viewer-with-applocker.md b/windows/keep-secure/using-event-viewer-with-applocker.md
index 0e722a1a83..ae4dc7e8a1 100644
--- a/windows/keep-secure/using-event-viewer-with-applocker.md
+++ b/windows/keep-secure/using-event-viewer-with-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Using Event Viewer with AppLocker (Windows 10)
 description: This topic lists AppLocker events and describes how to use Event Viewer with AppLocker.
-MSHAttr: PreferredLib /library
 ms.assetid: 109abb10-78b1-4c29-a576-e5a17dfeb916
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/using-software-restriction-policies-and-applocker-policies.md b/windows/keep-secure/using-software-restriction-policies-and-applocker-policies.md
index 6bb32572f5..ce10693cfd 100644
--- a/windows/keep-secure/using-software-restriction-policies-and-applocker-policies.md
+++ b/windows/keep-secure/using-software-restriction-policies-and-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Use Software Restriction Policies and AppLocker policies (Windows 10)
 description: This topic for the IT professional describes how to use Software Restriction Policies (SRP) and AppLocker policies in the same Windows deployment.
-MSHAttr: PreferredLib /library
 ms.assetid: c3366be7-e632-4add-bd10-9df088f74c6d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/view-the-security-event-log.md b/windows/keep-secure/view-the-security-event-log.md
index f096c8e301..2ec26e4bc2 100644
--- a/windows/keep-secure/view-the-security-event-log.md
+++ b/windows/keep-secure/view-the-security-event-log.md
@@ -1,7 +1,6 @@
 ---
 title: View the security event log (Windows 10)
 description: The security log records each event as defined by the audit policies you set on each object.
-MSHAttr: PreferredLib /library
 ms.assetid: 20DD2ACD-241A-45C5-A92F-4BE0D9F198B9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/vpn-profile-options.md b/windows/keep-secure/vpn-profile-options.md
index 300ff46bff..3c11ea96cd 100644
--- a/windows/keep-secure/vpn-profile-options.md
+++ b/windows/keep-secure/vpn-profile-options.md
@@ -1,7 +1,6 @@
 ---
 title: VPN profile options (Windows 10)
 description: Virtual private networks (VPN) let you give your users secure remote access to your company network. Windows 10 adds useful new VPN profile options to help you manage how users connect.
-MSHAttr: PreferredLib /library
 ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -17,14 +16,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Always On](#always-on)
--   [App-triggered VPN](#app-triggered-vpn)
--   [Traffic filters](#traffic-filters)
--   [LockDown VPN](#lockdown-vpn)
--   [Learn more](#learn-more)
-
 Virtual private networks (VPN) let you give your users secure remote access to your company network. Windows 10 adds useful new VPN profile options to help you manage how users connect.
 
 ## Always On
diff --git a/windows/keep-secure/what-is-applocker.md b/windows/keep-secure/what-is-applocker.md
index 1b47e98c06..28bc523226 100644
--- a/windows/keep-secure/what-is-applocker.md
+++ b/windows/keep-secure/what-is-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: What Is AppLocker (Windows 10)
 description: This topic for the IT professional describes what AppLocker is and how its features differ from Software Restriction Policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 44a8a2bb-0f83-4f95-828e-1f364fb65869
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/which-editions-of-windows-support-advanced-audit-policy-configuration.md b/windows/keep-secure/which-editions-of-windows-support-advanced-audit-policy-configuration.md
index 90b22ebe3a..fed78d4afa 100644
--- a/windows/keep-secure/which-editions-of-windows-support-advanced-audit-policy-configuration.md
+++ b/windows/keep-secure/which-editions-of-windows-support-advanced-audit-policy-configuration.md
@@ -1,7 +1,6 @@
 ---
 title: Which editions of Windows support advanced audit policy configuration (Windows 10)
 description: This reference topic for the IT professional describes which versions of the Windows operating systems support advanced security auditing policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 87c71cc5-522d-4771-ac78-34a2a0825f31
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/why-a-pin-is-better-than-a-password.md b/windows/keep-secure/why-a-pin-is-better-than-a-password.md
index 073b1a89d5..bfe73f6152 100644
--- a/windows/keep-secure/why-a-pin-is-better-than-a-password.md
+++ b/windows/keep-secure/why-a-pin-is-better-than-a-password.md
@@ -1,7 +1,6 @@
 ---
 title: Why a PIN is better than a password (Windows 10)
 description: Microsoft Passport in Windows 10 enables users to sign in to their device using a PIN. How is a PIN different from (and better than) a password .
-MSHAttr: PreferredLib /library
 ms.assetid: A6FC0520-01E6-4E90-B53D-6C4C4E780212
 keywords: ["pin", "security", "password"]
 ms.prod: W10
@@ -18,16 +17,6 @@ author: brianlic-msft
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [PIN is tied to the device](#pin-is-tied-to-the-device)
--   [PIN is local to the device](#pin-is-local-to-the-device)
--   [PIN is backed by hardware](#pin-is-backed-by-hardware)
--   [PIN can be complex](#pin-can-be-complex)
--   [What if someone steals the laptop or phone?](#what-if-someone-steals-the-laptop-or-phone-)
--   [Why do you need a PIN to use Windows Hello?](#why-do-you-need-a-pin-to-use-windows-hello-)
--   [Related topics](#related-topics)
-
 Microsoft Passport in Windows 10 enables users to sign in to their device using a PIN. How is a PIN different from (and better than) a password?
 
 On the surface, a PIN looks much like a password. A PIN can be a set of numbers, but enterprise policy might allow complex PINs that include special characters and letters, both upper-case and lower-case. Something like **t758A!** could be an account password or a complex Passport PIN. It isn't the structure of a PIN (length, complexity) that makes it better than a password, it's how it works.
diff --git a/windows/keep-secure/windows-10-mobile-security-guide.md b/windows/keep-secure/windows-10-mobile-security-guide.md
index ded5dd245b..f6095e2531 100644
--- a/windows/keep-secure/windows-10-mobile-security-guide.md
+++ b/windows/keep-secure/windows-10-mobile-security-guide.md
@@ -1,9 +1,8 @@
 ---
 title: Windows 10 Mobile security guide (Windows 10)
-description: This guide provides a detailed description of the most important security features in the Windows 10 Mobile operating system—identity access and control data protection malware resistance and app platform security.
-MSHAttr: PreferredLib /library
+description: This guide provides a detailed description of the most important security features in the Windows 10 Mobile operating system—identity access and control, data protection, malware resistance, and app platform security.
 ms.assetid: D51EF508-699E-4A68-A7CD-91D821A97205
-keywords: ["data protection encryption malware resistance smartphone device Windows Store"]
+keywords: ["data protection, encryption, malware resistance, smartphone, device, Windows Store"]
 ms.prod: W10
 ms.mktglfcycl: manage
 ms.sitesec: library
@@ -17,15 +16,6 @@ author: brianlic-msft
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Overview](#overview)
--   [Identity and access control](#identity-and-access-control)
--   [Data protection](#data-protection)
--   [Malware resistance](#malware-resistance)
--   [App platform security](#app-platform-security--)
--   [Related topics](#related-topics)
-
 This guide provides a detailed description of the most important security features in the Windows 10 Mobile operating system—identity access and control, data protection, malware resistance, and app platform security.
 
 ## Overview
diff --git a/windows/keep-secure/windows-10-security-guide.md b/windows/keep-secure/windows-10-security-guide.md
index 01f026fd6c..ec556b3cf0 100644
--- a/windows/keep-secure/windows-10-security-guide.md
+++ b/windows/keep-secure/windows-10-security-guide.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 security overview (Windows 10)
-description: This guide provides a detailed description of the most important security improvements in the Windows 10 operating system with links to more detailed articles about many of its security features.
-MSHAttr: PreferredLib /library
+description: This guide provides a detailed description of the most important security improvements in the Windows 10 operating system, with links to more detailed articles about many of its security features.
 ms.assetid: 4561D80B-A914-403C-A17C-3BE6FC95B59B
 keywords: ["configure", "feature", "file encryption"]
 ms.prod: W10
@@ -17,17 +16,6 @@ author: brianlic-msft
 
 -   Windows 10
 
-**In this article**
-
--   [Introduction](#introduction)
--   [Identity and access control](#identity)
--   [Information protection](#information)
--   [Malware resistance](#malware)
--   [Secure the Windows core](#secure-the-windows-core)
--   [Secure the Windows desktop](#secure-the-windows-desktop)
--   [Conclusion](#conclusion)
--   [Related topics](#related-topics)
-
 This guide provides a detailed description of the most important security improvements in the Windows 10 operating system, with links to more detailed articles about many of its security features. Wherever possible, specific recommendations are provided to help you implement and configure Windows 10 security features.
 
 ## Introduction
diff --git a/windows/keep-secure/windows-defender-in-windows-10.md b/windows/keep-secure/windows-defender-in-windows-10.md
index 0da7af398b..a7341189e6 100644
--- a/windows/keep-secure/windows-defender-in-windows-10.md
+++ b/windows/keep-secure/windows-defender-in-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Defender in Windows 10 (Windows 10)
-description: This topic provides an overview of Windows Defender including a list of system requirements and new features.
-MSHAttr: PreferredLib /library
+description: This topic provides an overview of Windows Defender, including a list of system requirements and new features.
 ms.assetid: 6A9EB85E-1F3A-40AC-9A47-F44C4A2B55E2
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -73,7 +72,12 @@ For more information about what's new in Windows Defender in Windows 10, see [W
 <tbody>
 <tr class="odd">
 <td align="left"><p>[Update and manage Windows Defender in Windows 10](get-started-with-windows-defender-for-windows-10.md)</p></td>
-<td align="left"><p>IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Active Directory or WSUS, and apply updates to endpoints.</p></td>
+<td align="left"><p>IT professionals can manage Windows Defender on Windows 10 endpoints in their organization using Active Directory or WSUS, apply updates to endpoints, and manage scans using:</p>
+<ul>
+<li>Group Policy Settings</li>
+<li>Windows Management Instrumentation (WMI)</li>
+<li>Windows PowerShell</li>
+</ul></td>
 </tr>
 <tr class="even">
 <td align="left"><p>[Configure Windows Defender in Windows 10](configure-windows-defender-for-windows-10.md)</p></td>
diff --git a/windows/keep-secure/windows-hello-biometrics-in-the-enterprise.md b/windows/keep-secure/windows-hello-biometrics-in-the-enterprise.md
index fc69193836..4604f69b3e 100644
--- a/windows/keep-secure/windows-hello-biometrics-in-the-enterprise.md
+++ b/windows/keep-secure/windows-hello-biometrics-in-the-enterprise.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Hello biometrics in the enterprise (Windows 10)
 description: Windows Hello is the biometric authentication feature that helps strengthen authentication and helps to guard against potential spoofing through fingerprint matching and facial recognition.
-MSHAttr: PreferredLib /library
 ms.assetid: D3F27D94-2226-4547-86C0-65C84D6DF8BC
 keywords: ["Windows Hello", "enterprise biometrics"]
 ms.prod: W10
diff --git a/windows/keep-secure/windows-installer-rules-in-applocker.md b/windows/keep-secure/windows-installer-rules-in-applocker.md
index f333b96455..5bab8afeaf 100644
--- a/windows/keep-secure/windows-installer-rules-in-applocker.md
+++ b/windows/keep-secure/windows-installer-rules-in-applocker.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Installer rules in AppLocker (Windows 10)
 description: This topic describes the file formats and available default rules for the Windows Installer rule collection.
-MSHAttr: PreferredLib /library
 ms.assetid: 3fecde5b-88b3-4040-81fa-a2d36d052ec9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/working-with-applocker-policies.md b/windows/keep-secure/working-with-applocker-policies.md
index 211a3c9bfc..815ea0211f 100644
--- a/windows/keep-secure/working-with-applocker-policies.md
+++ b/windows/keep-secure/working-with-applocker-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Working with AppLocker policies (Windows 10)
-description: This topic for IT professionals provides links to procedural topics about creating maintaining and testing AppLocker policies.
-MSHAttr: PreferredLib /library
+description: This topic for IT professionals provides links to procedural topics about creating, maintaining, and testing AppLocker policies.
 ms.assetid: 7062d2e0-9cbb-4cb8-aa8c-b24945c3771d
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/keep-secure/working-with-applocker-rules.md b/windows/keep-secure/working-with-applocker-rules.md
index 207e96330d..5fad689a53 100644
--- a/windows/keep-secure/working-with-applocker-rules.md
+++ b/windows/keep-secure/working-with-applocker-rules.md
@@ -1,7 +1,6 @@
 ---
 title: Working with AppLocker rules (Windows 10)
 description: This topic for IT professionals describes AppLocker rule types and how to work with them for your application control policies.
-MSHAttr: PreferredLib /library
 ms.assetid: 3966b35b-f2da-4371-8b5f-aec031db6bc9
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/manage/TOC.md b/windows/manage/TOC.md
index f6e3b0f7af..9ea286f676 100644
--- a/windows/manage/TOC.md
+++ b/windows/manage/TOC.md
@@ -18,7 +18,7 @@
 #### [Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](set-up-a-kiosk-for-windows-10-for-mobile-edition.md)
 ### [Lock down Windows 10 to specific apps](lock-down-windows-10-to-specific-apps.md)
 ### [Configure telemetry in your organization](configure-telemetry-in-your-organization.md)
-### [Disconnect from Microsoft and configure privacy settings in your organization](manage-privacy-for-windows-10-in-your-company.md)
+### [Disconnect from Microsoft and configure privacy settings in your organization](disconnect-your-organization-from-microsoft.md)
 ### [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
 ### [Manage Wi-Fi Sense in your company](manage-wi-fi-sense-in-your-company.md)
 ### [Configure Windows 10 Mobile using Lockdown XML](lockdown-xml.md)
diff --git a/windows/manage/add-unsigned-app-to-code-integrity-policy.md b/windows/manage/add-unsigned-app-to-code-integrity-policy.md
index 355af9e7e7..064d2cc81b 100644
--- a/windows/manage/add-unsigned-app-to-code-integrity-policy.md
+++ b/windows/manage/add-unsigned-app-to-code-integrity-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Add unsigned app to code integrity policy (Windows 10)
-description: When you want to add an unsigned app to a code integrity policy you need to start with a code integrity policy created from a reference device.
-MSHAttr: PreferredLib /library
+description: When you want to add an unsigned app to a code integrity policy, you need to start with a code integrity policy created from a reference device.
 ms.assetid: 580E18B1-2FFD-4EE4-8CC5-6F375BE224EA
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/administrative-tools-in-windows-10.md b/windows/manage/administrative-tools-in-windows-10.md
index 5cf76b4fa4..fc68012857 100644
--- a/windows/manage/administrative-tools-in-windows-10.md
+++ b/windows/manage/administrative-tools-in-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Administrative Tools in Windows 10 (Windows 10)
 description: Administrative Tools is a folder in Control Panel that contains tools for system administrators and advanced users.
-MSHAttr: PreferredLib /library
 ms.assetid: FDC63933-C94C-43CB-8373-629795926DC8
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/app-inventory-managemement-for-windows-store-for-business.md b/windows/manage/app-inventory-managemement-for-windows-store-for-business.md
index 0c862235e5..8332ba51fb 100644
--- a/windows/manage/app-inventory-managemement-for-windows-store-for-business.md
+++ b/windows/manage/app-inventory-managemement-for-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: App inventory management for Windows Store for Business (Windows 10)
 description: You can manage all apps that you've acquired on your Inventory page.
-MSHAttr: PreferredLib /library
 ms.assetid: 44211937-801B-4B85-8810-9CA055CDB1B2
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/apps-in-the-windows-store-for-business.md b/windows/manage/apps-in-the-windows-store-for-business.md
index e16722bb6c..6f4e3b40cd 100644
--- a/windows/manage/apps-in-the-windows-store-for-business.md
+++ b/windows/manage/apps-in-the-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Apps in Windows Store for Business (Windows 10)
 description: Windows Store for Business has thousands of apps from many different categories.
-MSHAttr: PreferredLib /library
 ms.assetid: CC5641DA-3CEA-4950-AD81-1AF1AE876926
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/assign-apps-to-employees.md b/windows/manage/assign-apps-to-employees.md
index 32d2fe4c6d..9d09dd9cf5 100644
--- a/windows/manage/assign-apps-to-employees.md
+++ b/windows/manage/assign-apps-to-employees.md
@@ -1,7 +1,6 @@
 ---
 title: Assign apps to employees (Windows 10)
-description: Administrators can assign online licensed apps to employees in their organization.
-MSHAttr: PreferredLib /library
+description: Administrators can assign online-licensed apps to employees in their organization.
 ms.assetid: A0DF4EC2-BE33-41E1-8832-DBB0EBECA31A
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md
index c114c407ea..09cf34d5bd 100644
--- a/windows/manage/change-history-for-manage-and-update-windows-10.md
+++ b/windows/manage/change-history-for-manage-and-update-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Change history for Manage and update Windows 10 (Windows 10)
 description: This topic lists new and updated topics in the Manage and update Windows 10 documentation for Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: 29144AFA-1DA9-4532-B07D-1EBE34B7E1E0
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -33,6 +32,18 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 <td align="left">[Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md)</td>
 <td align="left"><p>New</p></td>
 </tr>
+<tr class="even">
+<td align="left">[Cortana integration in your business or enterprise](manage-cortana-in-your-enterprise.md)</td>
+<td align="left"><p>Updated to include the new Preview feature, Cortana and Microsoft Dynamics CRM integration.</p></td>
+</tr>
+<tr class="odd">
+<td align="left">[Disconnect from Microsoft and configure privacy settings in your organization](disconnect-your-organization-from-microsoft.md)</td>
+<td align="left"><p>Removed the telemetry content into its own topic.</p></td>
+</tr>
+<tr class="even">
+<td align="left">[Configure telemetry in your organization](configure-telemetry-in-your-organization.md)</td>
+<td align="left"><p>Updated to include Windows Server 2016 Technical Preview.</p></td>
+</tr>
 </tbody>
 </table>
 
@@ -54,7 +65,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left">[Configure telemetry and other settings in your organization](manage-privacy-for-windows-10-in-your-company.md)</td>
+<td align="left">[Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md)</td>
 <td align="left"><p>Added call history and email to the Settings &gt; Privacy section.</p>
 <p>Added the Turn off Windows Mail application Group Policy to the Mail synchronization section.</p></td>
 </tr>
@@ -132,7 +143,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
 | [Windows Hello biometrics in the enterprise](../keep-secure/windows-hello-biometrics-in-the-enterprise.md)                                       | New         |
 | [Windows Store for Business](windows-store-for-business.md) (multiple topics)                                                                   | New         |
 | [Changes to Group Policy settings for Windows 10 Start](changes-to-start-policies-in-windows-10.md)                                             | Updated     |
-| [Configure telemetry and other settings in your organization](manage-privacy-for-windows-10-in-your-company.md)                                 | Updated     |
+| [Configure telemetry and other settings in your organization](disconnect-your-organization-from-microsoft.md)                                 | Updated     |
 | [New policies for Windows 10](new-policies-for-windows-10.md)                                                                                   | Updated     |
 
  
diff --git a/windows/manage/changes-to-start-policies-in-windows-10.md b/windows/manage/changes-to-start-policies-in-windows-10.md
index 21ad93cf71..65c31df22a 100644
--- a/windows/manage/changes-to-start-policies-in-windows-10.md
+++ b/windows/manage/changes-to-start-policies-in-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Changes to Group Policy settings for Windows 10 Start (Windows 10)
 description: Windows 10 has a brand new Start experience.
-MSHAttr: PreferredLib /library
 ms.assetid: 612FB68A-3832-451F-AA97-E73791FEAA9F
 keywords: ["group policy", "start menu", "start screen"]
 ms.prod: W10
@@ -17,12 +16,6 @@ author: jdeckerMS
 
 -   Windows 10
 
-**In this article**
-
--   [Start policy settings supported for Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education](#start-policy-settings-supported-for-windows-10-pro--windows-10-enterprise--and-windows-10-education)
--   [Deprecated Group Policy settings for Start](#deprecated-group-policy-settings-for-start-)
--   [Related topics](#related-topics)
-
 Windows 10 has a brand new Start experience. As a result, there are changes to the Group Policy settings that you can use to manage Start. Some policy settings are new or changed, and some old Start policy settings still apply. Other Start policy settings no longer apply and are deprecated.
 
 ## Start policy settings supported for Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education
diff --git a/windows/manage/configure-devices-without-mdm.md b/windows/manage/configure-devices-without-mdm.md
index b865998faf..f6bc2ddcc7 100644
--- a/windows/manage/configure-devices-without-mdm.md
+++ b/windows/manage/configure-devices-without-mdm.md
@@ -1,7 +1,6 @@
 ---
 title: Configure devices without MDM (Windows 10)
-description: Create a runtime provisioning package to apply settings profiles and file assets to a device running Windows 10 Pro Windows 10 Enterprise Windows 10 Education Windows 10 Mobile or Windows 10 Mobile Enterprise.
-MSHAttr: PreferredLib /library
+description: Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise.
 ms.assetid: 66D14E97-E116-4218-8924-E2A326C9367E
 keywords: ["runtime provisioning", "provisioning package"]
 ms.prod: W10
@@ -18,15 +17,6 @@ author: jdeckerMS
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Advantages](#advantages)
--   [Typical use cases](#typical-use-cases)
--   [Create package](#create-package)
--   [Apply package](#apply-package)
--   [Manage a package](#manage-a-package)
--   [Learn more](#learn-more)
-
 Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise.
 
 Sometimes mobile device management (MDM) isn't available to you for setting up a device because the device isn't connected to your network, or because an employee is remote and needs a fast replacement for a work device. You might not use MDM in your organization at all, but would like an easy way to place a standard configuration on multiple devices.
@@ -92,7 +82,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 3.  Name your project, and click **Next**.
 
-4.  Choose **Common to all Windows editions**, **Common to all Windows desktop editions**, or **Common to all Windows mobile editions**, depending on the devices you intent to provision, and click **Next**.
+4.  Choose **Common to all Windows editions**, **Common to all Windows desktop editions**, or **Common to all Windows mobile editions**, depending on the devices you intend to provision, and click **Next**.
 
 5.  On **New project**, click **Finish**. The workspace for your package opens.
 
diff --git a/windows/manage/configure-mdm-provider.md b/windows/manage/configure-mdm-provider.md
index 96b858f9cd..33917f1a5a 100644
--- a/windows/manage/configure-mdm-provider.md
+++ b/windows/manage/configure-mdm-provider.md
@@ -1,7 +1,6 @@
 ---
 title: Configure an MDM provider (Windows 10)
-description: For companies or organizations using mobile device management (MDM) tools those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses.
-MSHAttr: PreferredLib /library
+description: For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses.
 ms.assetid: B3A45C8C-A96C-4254-9659-A9B364784673
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/configure-telemetry-in-your-organization.md b/windows/manage/configure-telemetry-in-your-organization.md
index abf04b850a..3d185d0329 100644
--- a/windows/manage/configure-telemetry-in-your-organization.md
+++ b/windows/manage/configure-telemetry-in-your-organization.md
@@ -1,7 +1,6 @@
 ---
 title: Configure telemetry in your organization (Windows 10)
-description: Use this article to make informed decisions about how you can configure telemetry in your organization. We discuss telemetry as system data that is uploaded by the Connected User Experience and Telemetry component.
-MSHAttr: PreferredLib /library
+description: Use this article to make informed decisions about how you can configure telemetry in your organization.
 ms.assetid: 68D9BEAD-8ACE-4771-AF10-CCCD65EC7D98
 keywords: ["privacy", "telemetry"]
 ms.prod: W10
@@ -19,127 +18,125 @@ author: jdeckerMS
 -   Windows 10 Mobile
 -   Windows Server 2016 Technical Preview
 
-Use this article to make informed decisions about how you can configure telemetry in your organization. We discuss telemetry as system data that is uploaded by the Connected User Experience and Telemetry component.
+Use this article to make informed decisions about how you can configure telemetry in your organization. Telemetry is a term that means different things to different people and organizations. For the purpose of this article, we discuss telemetry as system data that is uploaded by the Connected User Experience and Telemetry component. The telemetry data is used to keep Windows devices secure, and to help Microsoft improve the quality of Windows and Microsoft services.
 
 **Note**  
-This article does not apply to System Center Configuration Manager, System Center Endpoint Protection, or System Center Data Protection Manager because those products use a different telemetry service than Windows and Windows Server
+This article does not apply to System Center Configuration Manager, System Center Endpoint Protection, or System Center Data Protection Manager because those components use a different telemetry service than Windows and Windows Server
 
  
 
-It describes the types of telemetry we collect and the ways you can manage its telemetry. This article also lists some examples of how telemetry can provide you with valuable insights into your enterprise deployments, and how Microsoft uses the data to quickly identify and address issues affecting its customers.
+It describes the types of telemetry we gather and the ways you can manage its telemetry. This article also lists some examples of how telemetry can provide you with valuable insights into your enterprise deployments, and how Microsoft uses the data to quickly identify and address issues affecting its customers.
 
 We understand that the privacy and security of our customers’ information is important and we have taken a thoughtful and comprehensive approach to customer privacy and the protection of their data with Windows 10, Windows Server 2016 Technical Preview, and System Center 2016.
 
 ## Overview
 
 
-*“In order to deliver the experiences our customers need for the mobile-first and cloud-first world, we will modernize our engineering processes to be customer-obsessed, data-driven, speed-oriented, and quality-focused. We will be more effective in predicting and understanding what our customers need and more nimble in adjusting to information we get from the market. We will streamline the engineering process and reduce the amount of time and energy it takes to get things done.” – Satya Nadella, July, 2014*
-
-In previous versions of Windows and Windows Server, Microsoft used telemetry to check for updated or new Windows Defender signatures, whether Windows Update installations were successful, collect reliability information through the Reliability Analysis Component (RAC) on Windows Server, and collect reliability information through the Windows Customer Experience Improvement Program (CEIP) on Windows. In Windows 10 and Windows Server 2016 Technical Preview , you can control telemetry streams by using **Settings** &gt; **Privacy**, Group Policy, or MDM.
+In previous versions of Windows and Windows Server, Microsoft used telemetry to check for updated or new Windows Defender signatures, check whether Windows Update installations were successful, gather reliability information through the Reliability Analysis Component (RAC) on Windows Server, and gather reliability information through the Windows Customer Experience Improvement Program (CEIP) on Windows. In Windows 10 and Windows Server 2016 Technical Preview, you can control telemetry streams by using **Settings** &gt; **Privacy**, Group Policy, or MDM.
 
 Microsoft is committed to improving customer experiences in a mobile-first and cloud-first world, and it all starts with our customers. Telemetry is one critical way Microsoft is using data to improve our products and services. Telemetry gives every enterprise customer a voice that helps us shape future versions of Windows, Windows Server and System Center, allowing us to respond quickly to your feedback and providing new features and improved quality to our customers.
 
-Our goal is to leverage the data to drive changes in the product and ecosystem to improve our customer experiences. We are also partnering with enterprises to provide added value from the telemetry information shared by their devices. Some examples include identifying outdated patches and downloading the latest antimalware signatures to help keep their devices secure, identifying application compatibility issues prior to upgrades, gaining insights into driver reliability issues affecting other customers, and using usage data to tune some of their operations to reduce the total cost of ownership (TCO) and downtime.
+Our goal is to leverage the aggregated data to drive changes in the product and ecosystem to improve our customer experiences. We are also partnering with enterprises to provide added value from the telemetry information shared by their devices. Some examples include identifying outdated patches and downloading the latest antimalware signatures to help keep their devices secure, identifying application compatibility issues prior to upgrades, gaining insights into driver reliability issues affecting other customers, and using usage data to tune some of their operations to reduce the total cost of ownership (TCO) and downtime.
 
-For Windows 10, we invite IT pros to join the Windows Insider Program to give us feedback on what we can do to make Windows work better for your organization.
+For Windows 10, we invite IT pros to join the Windows Insider Program to give us feedback on what we can do to make Windows work better for youcr organization.
 
-## How is telemetry information handled by Microsoft?
+## How is telemetry data handled by Microsoft?
 
 
-### Collection
+### Data collection
 
-Information gathered by the Connected User Experience and Telemetry component complies with Microsoft’s [security and privacy policies](https://privacy.microsoft.com/privacystatement/), as well as international laws and regulations. The principle of least privilege guides access to telemetry data. Only those who can demonstrate a valid business need can access the telemetry info.
+Data gathered by the Connected User Experience and Telemetry component complies with Microsoft’s [security and privacy policies](https://privacy.microsoft.com/privacystatement/), as well as international laws and regulations. The principle of least privilege guides access to telemetry data. Only Microsoft personnel who can demonstrate a valid business need can access the telemetry data.
 
 ### Data transfer
 
-All telemetry info is encrypted during transfer from the device to the Microsoft Data Management Service. Data is uploaded on a schedule that is sensitive to event priority, battery use, and network cost. Real-time events, such as gaming achievements, are always sent immediately. Normal events are not uploaded on metered networks, unless you are on a metered server connection. On a free network, normal events can be uploaded every 4 hours if on battery, or every 15 minutes if on A/C power. Diagnostic and crash data are only uploaded on A/C power and free networks.
+All telemetry data is encrypted using SSL and uses certificate pinning during transfer from the device to the Microsoft Data Management Service. With Windows 10,data is uploaded on a schedule that is sensitive to event priority, battery use, and network cost. Real-time events, such as Windows Defender Advanced Threat Protection,are always sent immediately. Normal events are not uploaded on metered networks, unless you are on a metered server connection. On a free network, normal events can be uploaded every 4 hours if on battery, or every 15 minutes if on A/C power. Diagnostic and crash data are only uploaded on A/C power and free networks.
 
-### Microsoft Data Management Service
+### Endpoints
 
-The Microsoft Data Management Service routes information to internal cloud storage. Only people with a valid business justification are permitted access. The Connected User Experiences and Telemetry component connects to the Microsoft Data Management service at v10.vortex-win.data.microsoft.com. The Connected User Experience and Telemetry component also connects to settings-win.data.microsoft.com to download configuration information.
+The Microsoft Data Management Service routes data back to our secure cloud storage. Only Microsoft personnel with a valid business justification are permitted access. The Connected User Experience and Telemetry component connects to the Microsoft Data Management service at v10.vortex-win.data.microsoft.com. The Connected User Experience and Telemetry component also connects to settings-win.data.microsoft.com to download configuration information.
 
 ### Data usage
 
-Microsoft does not share personal data of our customers with third parties, except at the customer’s direction or for the limited purposes described in the Privacy Statement. We do share business reports with OEMs and third party partners that includes aggregated, anonymized telemetry information. Data-sharing decisions are made by an internal team including privacy, legal, and data management.
+Data gathered from telemetry is used by Microsoft teams primarily to improve our customer experiences, and for security, health, quality, and performance analysis. Microsoft does not share personal data of our customers with third parties, except at the customer’s discretion or for the limited purposes described in the Privacy Statement. We do share business reports with OEMs and third party partners that includes aggregated, anonymized telemetry information. Data-sharing decisions are made by an internal team including privacy, legal, and data management.
 
 ### Retention
 
-Microsoft believes in and practices information minimization, so we only gather the info we need, and we only store it for as long as it’s needed to provide a service or for analysis. Much of the info about how Windows 10, Windows Server 2016 Technical Preview, and System Center are functioning is deleted within 30 days. Other info may be retained longer, particularly if there is a regulatory requirement to do so. Info is typically gathered at a fractional sampling rate, which for some client services, can be as low as 1%.
+Microsoft only gathers the information we need, and it is only stored for as long as it is needed to provide a service or for analysis. Most of the data is deleted within 30 days.
 
 ## How is the data gathered?
 
 
-Windows 10 and Windows 10 includes the Connected User Experience and Telemetry component, which uses Event Tracing for Windows (ETW) [tracelogging](http://msdn.microsoft.com/library/dn904632.aspx) technology to gather and store telemetry events and data. The operating system and some Microsoft management solutions, such as System Center, use the same logging technology.
+Windows 10 and Windows Server 2016 Technical Preview includes the Connected User Experience and Telemetry component, which uses Event Tracing for Windows (ETW) [tracelogging](http://msdn.microsoft.com/library/dn904632.aspx) technology to gather and store telemetry events and data. The operating system and some Microsoft management solutions, such as System Center, use the same logging technology.
 
 1.  Operating system features and some management applications are instrumented to publish events and data. Examples of management applications include Virtual Machine Manager (VMM), Server Manager, and Storage Spaces.
 
-2.  Events are collected using public operating system event logging and tracing APIs.
+2.  Events are gathered using public operating system event logging and tracing APIs.
 
 3.  You can configure the telemetry level by using an MDM policy, Group Policy, or registry settings.
 
-4.  The Connected User Experience and Telemetry component transmits telemetry data over HTTPS to Microsoft. It uses certificate pinning to protect against man-in-the-middle attacks and moresecurely deliver the data.
+4.  The Connected User Experience and Telemetry component transmits telemetry data over HTTPS to Microsoft and uses certificate pinning.
 
 ## Telemetry levels
 
 
-This section explains the different telemetry levels in Windows 10, Windows Server 2016 Technical Preview, and System Center. These levels are available on all desktop and mobile editions of Windows 10, with the exception of the Security level which is limited to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), and Windows Server 2016 Technical Preview.
+This section explains the different telemetry levels in Windows 10, Windows Server 2016 Technical Preview, and System Center. These levels are available on all desktop and mobile editions of Windows 10, with the exception of the **Security** level which is limited to Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile Enterprise, Windows 10 IoT Core (IoT Core), and Windows Server 2016 Technical Preview.
 
 The telemetry data is categorized into four levels:
 
--   **Security**. Information that’s required to help keep Windows, Windows Server, and System Center secure, including info about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Windows Defender.
+-   **Security**. Information that’s required to help keep Windows, Windows Server, and System Center secure, including data about the Connected User Experience and Telemetry component settings, the Malicious Software Removal Tool, and Windows Defender.
 
--   **Basic**. Basic device info, including: quality-related info, app compat, and info from the Security level.
+-   **Basic**. Basic device info, including: quality-related data, app compat, app usage data, and data from the **Security** level.
 
--   **Enhanced**. Additional insights, including: how Windows, Windows Server, System Center, and apps are used, how they perform, advanced reliability info, and info from both the Basic and the Security levels.
+-   **Enhanced**. Additional insights, including: how Windows, Windows Server, System Center, and apps are used, how they perform, advanced reliability data, and data from both the **Basic** and the **Security** levels.
 
--   **Full**. All info necessary to identify and help to fix problems, plus info from the Security, Basic, and Enhanced levels.
+-   **Full**. All data necessary to identify and help to fix problems, plus data from the **Security**, **Basic**, and **Enhanced** levels.
 
-The levels are cumulative and are illustrated into the following diagram:
+The levels are cumulative and are illustrated in the following diagram. These levels apply to all editions of Windows Server 2016 Technical Preview.
 
 ![breakdown of telemetry levels and types of administrative controls](images/priv-telemetry-levels.png)
 
 ### Security level
 
-The security level gathers only the telemetry info that is required to keep Windows devices, Windows Server, and guests secure with the latest security updates.
+The Security level gathers only the telemetry info that is required to keep Windows devices, Windows Server, and guests secure with the latest security updates.
 
 **Note**  
-If your organization relies on Windows Update for updates, you shouldn’t use the Security level. Because no Windows Update information is gathered at this level, Microsoft can’t tell whether an update successfully installed.
+If your organization relies on Windows Update for updates, you shouldn’t use the **Security** level. Because no Windows Update information is gathered at this level, important information about update failures is not sent. Microsoft uses this information to fix the causes of those failures and improve the quality of our updates.
 
-Windows Server Update Services (WSUS) and System Center Configuration Manager functionality is not affected at this level, nor is telemetry data about Windows Server features or System Center collected.
+Windows Server Update Services (WSUS) and System Center Configuration Manager functionality is not affected at this level, nor is telemetry data about Windows Server features or System Center gathered.
 
  
 
-Security level info includes:
+The data gathered at this level includes:
 
--   **Connected User Experience and Telemetry component settings**. If data has been gathered and is queued to be sent, the Connected User Experience and Telemetry component downloads its settings file from Microsoft’s servers. The data collected by the client for this request includes OS information, device id (used to identify what specific device is requesting settings) and device class (for example, whether the device is server or desktop).
+-   **Connected User Experience and Telemetry component settings**. If data has been gathered and is queued to be sent, the Connected User Experience and Telemetry component downloads its settings file from Microsoft’s servers. The data gathered by the client for this request includes OS information, device id (used to identify what specific device is requesting settings) and device class (for example, whether the device is server or desktop).
 
 -   **Malicious Software Removal Tool (MSRT)** The MSRT infection report contains information, including device info and IP address.
 
     **Note**  
-    You can turn off the MSRT infection report. No MSRT information is included if MSRT is not used. If Windows Update is turned off, MSRT will not be offered to users.
+    You can turn off the MSRT infection report. No MSRT information is included if MSRT is not used. If Windows Update is turned off, MSRT will not be offered to users. For more info, see Microsoft KB article [891716](http://support.microsoft.com/kb/891716).
 
      
 
--   **Windows Defender**. Windows Defender requires some information to function, including: anti-malware signatures, diagnostic information, User Account Control settings, Unified Extensible Firmware Interface (UEFI) settings, and IP address.
+-   **Windows Defender/Endpoint Protection**. Windows Defender and System Center Endpoint Protection requires some information to function, including: anti-malware signatures, diagnostic information, User Account Control settings, Unified Extensible Firmware Interface (UEFI) settings, and IP address.
 
     **Note**  
-    This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off.
+    This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off. For more info, see [Windows Defender](manage-privacy-for-windows-10-in-your-company.md#windows-defender).
 
     Microsoft recommends that Windows Update, Windows Defender, and MSRT remain enabled unless the enterprise uses alternative solutions such as Windows Server Update Services, System Center Configuration Manager, or a third party antimalware solution. Windows Update, Windows Defender, and MSRT provide core Windows functionality such as driver and OS updates, including security updates.
 
      
 
-For servers with default telemetry settings and no Internet connectivity, you should set the telemetry level to Security. This stops data collection for events that would not be uploaded due to the lack of Internet connectivity.
+For servers with default telemetry settings and no Internet connectivity, you should set the telemetry level to **Security**. This stops data gathering for events that would not be uploaded due to the lack of Internet connectivity.
 
-No user content, such as user files or communications, is collected at the Security telemetry level, and we take steps to avoid gathering any information that directly identifies a company or user, such as name, email address, or account ID. However, in rare circumstances, MSRT information may unintentionally contain personal information. For instance, some malware may create entries in a computer’s registry that include information such as a username, causing it to be gathered. MSRT reporting is optional and can be turned off at any time.
+No user content, such as user files or communications, is gathered at the **Security** telemetry level, and we take steps to avoid gathering any information that directly identifies a company or user, such as name, email address, or account ID. However, in rare circumstances, MSRT information may unintentionally contain personal information. For instance, some malware may create entries in a computer’s registry that include information such as a username, causing it to be gathered. MSRT reporting is optional and can be turned off at any time.
 
 ### Basic level
 
-The Basic level gathers a limited set of info that’s critical for understanding the device and its configuration. This level also includes the Security level info. This level helps to identify problems that can occur on a particular device hardware or software configuration. For example, it can help determine if crashes are more frequent on devices with a specific amount of memory or that are running a particular driver version. The Connected User Experience and Telemetry component does not gather telemetry data about System Center, but it can transmit telemetry for other non-Windows applications if they gained user consent.
+The Basic level gathers a limited set of data that’s critical for understanding the device and its configuration. This level also includes the **Security** level data. This level helps to identify problems that can occur on a particular device hardware or software configuration. For example, it can help determine if crashes are more frequent on devices with a specific amount of memory or that are running a particular driver version. The Connected User Experience and Telemetry component does not gather telemetry data about System Center, but it can transmit telemetry for other non-Windows applications if they have user consent.
 
-The data collected at this level includes:
+The data gathered at this level includes:
 
--   **Basic device info**. Helps provide an understanding about the types of Windows devices and the configurations and types of native and virtualized Windows Server 2016 Technical Previewinstances in the ecosystem, including:
+-   **Basic device data**. Helps provide an understanding about the types of Windows devices and the configurations and types of native and virtualized Windows Server 2016 Technical Previewinstances in the ecosystem, including:
 
     -   Device attributes, such as camera resolution and display type
 
@@ -149,86 +146,84 @@ The data collected at this level includes:
 
     -   Networking attributes, such as number of network adapters, speed of network adapters, mobile operator network, and IMEI number
 
-    -   Processor and memory attributes, such as number of cores, arhcitecture, speed, memory size, and firmware
+    -   Processor and memory attributes, such as number of cores, architecture, speed, memory size, and firmware
 
-    -   o Virtualization attribute, such as SLAT support and guest operating system
+    -   Virtualization attribute, such as Second Level Address Translation (SLAT) support and guest operating system
 
     -   Operating system attributes, such as Windows edition and virtualization state
 
     -   Storage attributes, such as number of drives, type, and size
 
--   **Connected User Experience and Telemetry component quality metrics**. Helps provide an understanding about how the Connected User Experience and Telemetry component is functioning, including uploaded events, dropped events, and the last upload time.
+-   **Connected User Experience and Telemetry component quality metrics**. Helps provide an understanding about how the Connected User Experience and Telemetry component is functioning, including % of uploaded events, dropped events, and the last upload time.
 
--   **Quality-related information**. Helps Microsoft develop a basic understanding of how a device and its operating system are performing. Some examples are the amount of time a connected standby device was able to fullsleep, the number of crashes or hangs, and application state change details, such as how much processor time and memory were used, and the total uptime for an app.
+-   **Quality-related information**. Helps Microsoft develop a basic understanding of how a device and its operating system are performing. Some examples are the device characteristics of a Connected Standby device, the number of crashes or hangs, and application state change details, such as how much processor time and memory were used, and the total uptime for an app.
 
--   **App compat info**. Helps provide an understanding about which apps are installed on a device and to help identify potential compatibility problems.
+-   **Compatibility data**. Helps provide an understanding about which apps are installed on a device or virtual machine and identifies potential compatibility problems.
 
-    -   **General app info and app info for Internet Explorer add-ons**. Includes a list of apps that are installed on a native or virtualized instance of the OS and whether these apps function correctly after an upgrade.This app info includes the app name, publisher, version, and basic details about which files have been blocked from usage.
+    -   **General app data and app data for Internet Explorer add-ons**. Includes a list of apps that are installed on a native or virtualized instance of the OS and whether these apps function correctly after an upgrade.This app data includes the app name, publisher, version, and basic details about which files have been blocked from usage.
 
-    -   **Internet Explorer add-on info**. Includes a list of Internet Explorer add-ons that are installed on a device and whether these apps will work after an upgrade.
+    -   **App usage data**. Includes how an app is used, including how long an app is used for, when the app has focus, and when the app is started
 
-    -   **System info**. Helps provide an understanding about whether a device meets the minimum requirements to upgrade to the next version of the operating system. System information includes the amount of memory, as well as info about the processor and BIOS.
+    -   **Internet Explorer add-ons**. Includes a list of Internet Explorer add-ons that are installed on a device and whether these apps will work after an upgrade.
 
-    -   **Accessory device info**. Includes a list of accessory devices, such as printers or external storage devices, that are connected to Windows PCs and whether these devices will function after upgrading to a new version of the operating system.
+    -   **System data**. Helps provide an understanding about whether a device meets the minimum requirements to upgrade to the next version of the operating system. System information includes the amount of memory, as well as information about the processor and BIOS.
 
-    -   **Driver info**. Includes specific driver usage that’s meant to help figure out whether apps and devices will function after upgrading to a new version of the operating system. This info can help to determine blocking issues and then help Microsoft and our partners apply fixes and improvements.
+    -   **Accessory device data**. Includes a list of accessory devices, such as printers or external storage devices, that are connected to Windows PCs and whether these devices will function after upgrading to a new version of the operating system.
 
--   **Store**. Provides info about how the Windows Store performs, including app downloads, installations, and updates. It also includes Windows Store launches, page views, suspend and resumes, and obtaining licenses.
+    -   **Driver data**. Includes specific driver usage that’s meant to help figure out whether apps and devices will function after upgrading to a new version of the operating system. This can help to determine blocking issues and then help Microsoft and our partners apply fixes and improvements.
 
-Data collected at the Basic level helps to identify whether a problem occurs on a particular device hardware or software configuration. For example, it can help determine if a crash happens most frequently on devices with a certain memory type or a particular network driver version.
+-   **Store**. Provides information about how the Windows Store performs, including app downloads, installations, and updates. It also includes Windows Store launches, page views, suspend and resumes, and obtaining licenses.
 
 ### Enhanced level
 
-The Enhanced level collects info about how Windows and apps are used and how they perform. This level also includes info from both the Basic and Security levels. This level helps to improve experiences by analyzing user interaction with the operating system and apps. Info from this level can be abstracted into patterns and trends that can help Microsoft determine future improvements.
+The Enhanced level gathers data about how Windows and apps are used and how they perform. This level also includes data from both the **Basic** and **Security** levels. This level helps to improve the user experiencewith the operating system and apps. Data from this level can be abstracted into patterns and trends that can help Microsoft determine future improvements.
 
-This is the default level, and the minimum level needed to quickly identify and address Windows, Windows Server, and System Center quality issues. For example, in Windows Server 2016 Technical Preview 4, if the operating system or an application crashes or hangs, the memory contents of the faulting process at the time of the crash or hang is gathered in a heap dump. This data provides Microsoft with valuable information needed to analyze and fix the issues.
+This is the default level, and the minimum level needed to quickly identify and address Windows, Windows Server, and System Center quality issues.
 
-The data collected at this level includes:
+The data gathered at this level includes:
 
 -   **Operating system events**. Helps to gain insights into different areas of the operating system, including networking, Hyper-V, Cortana, storage, file system, and other components.
 
 -   **Operating system app events**. A set of events resulting from Microsoft applications and management tools that were downloaded from the Store or pre-installed with Windows or Windows Server, including Server Manager, Photos, Mail, and Microsoft Edge.
 
--   **Device-specific events**. Contains info about events that are specific to certain devices, such as Surface Hub and Microsoft HoloLens. For example, Microsoft HoloLens sends Holographic Processing Unit (HPU)-related events.
+-   **Device-specific events**. Contains data about events that are specific to certain devices, such as Surface Hub and Microsoft HoloLens. For example, Microsoft HoloLens sends Holographic Processing Unit (HPU)-related events.
 
-You can turn on or turn off System Center telemetry collection. The default is on and the data gathered at this level represents what is collected by default when System Center telemetry is turned on. However, setting the operating system telemetry level to Basic will turn off System Center telemetry, even if the System Center telemetry switch is turned on.
-
-If the Connected User Experience and Telemetry component detects a problem on Windows 10 that requires collecting more detailed instrumentation, the Connected User Experience and Telemetry component will only collect info about the events associated with the specific issue. Also, if the operating system or an app crashes or hangs, Microsoft will collect the memory contents of the faulting process only at the time of the crash or hang.
+If the Connected User Experience and Telemetry component detects a problem on Windows 10 that requires gathering more detailed instrumentation, the Connected User Experience and Telemetry component at the **Enhanced** telemetry level will only gather data about the events associated with the specific issue.
 
 ### Full level
 
-The Full level collect data necessary to identify and to help fix problems, following the approval process described below. This level also includes info from the Basic, Enhanced, and Security levels.
+The Full level gathers data necessary to identify and to help fix problems, following the approval process described below. This level also includes data from the **Basic**, **Enhanced**, and **Security** levels.
 
-Additionally, at this level, devices opted in to the Windows Insider Program will send events that can show Microsoft how pre-release binaries and features are performing. All devices in the Windows Insider Program are automatically set to this level.
+Additionally, at this level, devices opted in to the Windows Insider Program will send events, such as reliability and app responsiveness. that can show Microsoft how pre-release binaries and features are performing. These events help us make decisions on which builds are flighted. All devices in the Windows Insider Program are automatically set to this level.
 
-If a device experiences problems that are difficult to identify or repeat using Microsoft’s internal testing, additional info becomes necessary. This info can include any user content that might have triggered the problem and is gathered from a small sample of devices that have both opted into the Full telemetry level and have exhibited the problem.
+If a device experiences problems that are difficult to identify or repeat using Microsoft’s internal testing, additional data becomes necessary. This data can include any user content that might have triggered the problem and is gathered from a small sample of devices that have both opted into the **Full** telemetry level and have exhibited the problem.
 
-However, before more info is gathered, Microsoft’s privacy governance team, including privacy and other subject matter experts, must approve the diagnostics request made by a Microsoft engineer. If the request is approved, Microsoft engineers can use the following capabilities to get the information:
+However, before more data is gathered, Microsoft’s privacy governance team, including privacy and other subject matter experts, must approve the diagnostics request made by a Microsoft engineer. If the request is approved, Microsoft engineers can use the following capabilities to get the information:
 
 -   Ability to run a limited, pre-approved list of Microsoft certified diagnostic tools, such as msinfo32.exe, powercfg.exe, and dxdiag.exe.
 
 -   Ability to get registry keys.
 
--   Ability to gather user content, such as documents, if they might have been the trigger for the issue.
-
 ### Manage your telemetry settings
 
-We do not recommend that you turn off telemetry in your organization, but we recognize that in some scenarios this may be required. Use the steps in this section to do so for Windows, Windows Server, and System Center.
+We do not recommend that you turn off telemetry in your organization as valuable functionality may be impacted, but we recognize that in some scenarios this may be required. Use the steps in this section to do so for Windows, Windows Server, and System Center.
 
 **Important**  
-These telemetry levels only apply to Windows, Windows Server, and System Center components and apps that use the Connected User Experience and Telemetry component. Non-Windows components, such as Microsoft Office or other 3rd-party apps, may communicate with their cloud services outside of these telemetry levels. App publishers must let people know about how they use their telemetry, ways to opt in or opt out, and they must separately document their privacy policies.
+These telemetry levels only apply to Windows, Windows Server, and System Center components and apps that use the Connected User Experience and Telemetry component. Non-Windows components, such as Microsoft Office or other 3rd-party apps, may communicate with their cloud services outside of these telemetry levels. You should work with your app vendors to understand their telemetry policy, and how you can to opt in or opt out. For more information on how Microsoft Office uses telemetry, see [Overview of Office Telemetry](http://technet.microsoft.com/library/jj863580.aspx).
 
  
 
-The lowest telemetry setting level supported through management policies is Security. The lowest telemetry setting supported through the Settings UI is Basic. The default telemetry setting for Windows Server 2016 Technical Preview is Enhanced.
+You can turn on or turn off System Center telemetry gathering. The default is on and the data gathered at this level represents what is gathered by default when System Center telemetry is turned on. However, setting the operating system telemetry level to **Basic** will turn off System Center telemetry, even if the System Center telemetry switch is turned on.
+
+The lowest telemetry setting level supported through management policies is **Security**. The lowest telemetry setting supported through the Settings UI is **Basic**. The default telemetry setting for Windows Server 2016 Technical Preview is **Enhanced.**
 
 ### Configure the operating system telemetry level
 
-You can configure your operating system telemetry settings using the management tools you’re already using, such as Group Policy, MDM, or Windows Provisioning. You can also manually change your settings using Registry Editor. Setting your telemetry levels through a management policy overrides any device-level settings.
+You can configure your operating system telemetry settings using the management tools you’re already using, such as Group Policy, MDM, or Windows Provisioning. You can also manually change your settings using Registry Editor. Setting your telemetry levels through a management policy overrides any devicelevel settings.
 
 Use the appropriate value in the table below when you configure the management policy.
 
-| Value | Level    | Data collected                                                                                                            |
+| Value | Level    | Data gathered                                                                                                             |
 |-------|----------|---------------------------------------------------------------------------------------------------------------------------|
 | **0** | Security | Security data only.                                                                                                       |
 | **1** | Basic    | Security data, and basic system and quality data.                                                                         |
@@ -261,7 +256,7 @@ Use Registry Editor to manually set the registry level on each device in your or
 
 3.  Type **AllowTelemetry**, and then press ENTER.
 
-4.  Double-click **AllowTelemetry**, set the desired value, and then click **OK.**
+4.  Double-click **AllowTelemetry**, set the desired value from the table above, and then click **OK.**
 
 5.  Click **File** &gt; **Export**, and then save the file as a .reg file, such as **C:\\AllowTelemetry.reg**. You can run this file from a script on each device in your organization.
 
@@ -279,14 +274,14 @@ There are a few more settings that you can turn off that may send telemetry info
 
 -   To turn off Windows Update telemetry, you have two choices. Either turn off Windows Update, or set your devices to be managed by an on premises update server, such as [Windows Server Update Services (WSUS)](http://technet.microsoft.com/library/hh852345.aspx) or [System Center Configuration Manager](http://www.microsoft.com/server-cloud/products/system-center-2012-r2-configuration-manager/).
 
--   Turn off **Windows Defender Cloud-based Protection** and **Automatic sample submission** in **Settings** &gt; **Update & securit**y &gt; **Windows Defender**.
+-   Turn off **Windows Defender Cloud-based Protection** and **Automatic sample submission** in **Settings** &gt; **Update & security** &gt; **Windows Defender**.
 
--   Manage the Malicious Software Removal Tool in your organization. For more info, see Microsoft KB article [891716.](http://support.microsoft.com/kb/891716)
+-   Manage the Malicious Software Removal Tool in your organization. For more info, see Microsoft KB article [891716](http://support.microsoft.com/kb/891716).
 
--   Turn off **Linguistic Data Collection** in **Settings** &gt; **Privacy**. At telemetry levels Enhanced and Full, Microsoft uses Linguistic Data Collection info to improve language model features such as autocomplete, spellcheck, suggestions, input pattern recognition, and dictionary.
+-   Turn off **Linguistic Data Collection** in **Settings** &gt; **Privacy**. At telemetry levels **Enhanced** and **Full**, Microsoft uses Linguistic Data Collection info to improve language model features such as autocomplete, spellcheck, suggestions, input pattern recognition, and dictionary.
 
     **Note**  
-    Microsoft doesn't intentionally gather sensitive information, such as credit card numbers, usernames and passwords, email addresses, or other similarly sensitive information for Linguistic Data Collection. We guard against such events by using technologies to identify and remove sensitive information before linguistic data is sent from the user's device. If we determine that sensitive information has been inadvertently received, we delete the information.
+    Microsoft do not intend to gather sensitive information, such as credit card numbers, usernames and passwords, email addresses, or other similarly sensitive information for Linguistic Data Collection. We guard against such events by using technologies to identify and remove sensitive information before linguistic data is sent from the user's device. If we determine that sensitive information has been inadvertently received, we delete the information.
 
      
 
@@ -295,15 +290,15 @@ There are a few more settings that you can turn off that may send telemetry info
 
 ### Drive higher apps and driver quality in the ecosystem
 
-Telemetry plays an important role in quickly identifying and fixing critical reliability and security issues in our customers’ deployments and configurations. Insights into the telemetry data we collect help us to quickly identify crashes or hangs associated with a certain application or driver on a given configuration, like a particular storage type (for example, SCSI) or a memory size. For System Center, job usages and statuses can also help us enhance the job workload and the communication between System Center and its managed products. Microsoft’s ability to get this data from customers and drive improvements into the ecosystem helps raise the bar for the quality of System Center, Windows Server applications, Windows apps, and drivers. Real-time data about Windows installations reduces downtime and the cost associated with troubleshooting unreliable drivers or unstable applications
+Telemetry plays an important role in quickly identifying and fixing critical reliability and security issues in our customers’ deployments and configurations. Insights into the telemetry data we gather helps us to quickly identify crashes or hangs associated with a certain application or driver on a given configuration, like a particular storage type (for example, SCSI) or a memory size. For System Center, job usages and statuses can also help us enhance the job workload and the communication between System Center and its managed products. Microsoft’s ability to get this data from customers and drive improvements into the ecosystem helps raise the bar for the quality of System Center, Windows Server applications, Windows apps, and drivers. Real-time data about Windows installations reduces downtime and the cost associated with troubleshooting unreliable drivers or unstable applications
 
 ### Reduce your total cost of ownership and downtime
 
-Telemetry provides a view of which features and services customers use most. For example, the telemetry info provides us with a heat map of the most commonly deployed Windows Server roles, most used Windows features, and which ones are used the least. This helps us make informed decisions on where we should invest our engineering resources to build a leaner operating system. For System Center, understanding the customer environment for management and monitoring will help drive the support compatibilities matrix, such as host and guest OS. This can help you use existing hardware to meet your business needs and reduce your total cost of ownership, as well as reducing downtime associated with security updates.
+Telemetry provides a view of which features and services customers use most. For example, the telemetry data provides us with a heat map of the most commonly deployed Windows Server roles, most used Windows features, and which ones are used the least. This helps us make informed decisions on where we should invest our engineering resources to build a leaner operating system. For System Center, understanding the customer environment for management and monitoring will help drive the support compatibilities matrix, such as host and guest OS. This can help you use existing hardware to meet your business needs and reduce your total cost of ownership, as well as reducing downtime associated with security updates.
 
 ### <a href="" id="build-features-that-address-our-customers--needs"></a>Build features that address our customers’ needs
 
-Telemetry also helps us better understand how customers deploy components, use features, and use services to achieve their business goals. Getting insights from that information helps us prioritize our engineering investments in areas that can directly affect our customers’ experiences and workloads. Some examples include customer usage patterns of containers, storage, and networking configurations associated with Windows Server roles like Clustering and Web. Another example could be to find out when is CPU hyper-threading turned off and the resulting impact. We use the insights to drive improvements and intelligence into some of our management and monitoring solutions, to help customers diagnose quality issues, and save money by making fewer help calls to Microsoft.
+Telemetry also helps us better understand how customers deploy components, use features, and use services to achieve their business goals. Getting insights from that information helps us prioritize our engineering investments in areas that can directly affect our customers’ experiences and workloads. Some examples include customer usage of containers, storage, and networking configurations associated with Windows Server roles like Clustering and Web. Another example could be to find out when is CPU hyper-threading turned off and the resulting impact. We use the insights to drive improvements and intelligence into some of our management and monitoring solutions, to help customers diagnose quality issues, and save money by making fewer help calls to Microsoft.
 
  
 
diff --git a/windows/manage/customize-and-export-start-layout.md b/windows/manage/customize-and-export-start-layout.md
index 77eb0e10db..4996d94fe2 100644
--- a/windows/manage/customize-and-export-start-layout.md
+++ b/windows/manage/customize-and-export-start-layout.md
@@ -1,7 +1,6 @@
 ---
 title: Customize and export Start layout (Windows 10)
 description: The easiest method for creating a customized Start layout to apply to other Windows 10 devices is to set up the Start screen on a test computer and then export the layout.
-MSHAttr: PreferredLib /library
 ms.assetid: CA8DF327-5DD4-452F-9FE5-F17C514B6236
 keywords: ["start screen"]
 ms.prod: W10
@@ -21,13 +20,6 @@ author: jdeckerMS
 
 -   [Customize the Start menu](http://go.microsoft.com/fwlink/p/?LinkId=623630)
 
-**In this article**
-
--   [Customize the Start screen on your test computer](#bkmkcustomizestartscreen)
--   [Export the Start layout](#bmk-exportstartscreenlayout)
--   [Configure a partial Start layout](#configure-a-partial-start-layout)
--   [Related topics](#related-topics)
-
 The easiest method for creating a customized Start layout to apply to other Windows 10 devices is to set up the Start screen on a test computer and then export the layout.
 
 After you export the layout, decide whether you want to apply a *full* Start layout or a *partial* Start layout.
diff --git a/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md b/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md
index d65bfb2239..30f8bc2899 100644
--- a/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md
+++ b/windows/manage/customize-windows-10-start-screens-by-using-group-policy.md
@@ -1,7 +1,6 @@
 ---
 title: Customize Windows 10 Start with Group Policy (Windows 10)
-description: In Windows 10 Enterprise and Windows 10 Education you can use a Group Policy Object (GPO) to deploy a customized Start layout to users in a domain.
-MSHAttr: PreferredLib /library
+description: In Windows 10 Enterprise and Windows 10 Education, you can use a Group Policy Object (GPO) to deploy a customized Start layout to users in a domain.
 ms.assetid: F4A47B36-F1EF-41CD-9CBA-04C83E960545
 keywords: ["Start layout", "start menu", "layout", "group policy"]
 ms.prod: W10
@@ -21,15 +20,6 @@ author: jdeckerMS
 
 -   [Customize the Start menu](http://go.microsoft.com/fwlink/p/?LinkId=623630)
 
-**In this article**
-
--   [Operating system requirements](#operating-system-requirements)
--   [How Start layout control works](#bkmk-howstartscreencontrolworks)
--   [Use Group Policy to apply a customized Start layout in a domain](#bkmk-domaingpodeployment)
--   [Use Group Policy to apply a customized Start layout on the local computer](#bkmk-localgpimport)
--   [Update a customized Start layout](#bkmk-updatestartscreenlayout)
--   [Related topics](#related-topics)
-
 In Windows 10 Enterprise and Windows 10 Education, you can use a Group Policy Object (GPO) to deploy a customized Start layout to users in a domain. No reimaging is required, and the Start layout can be updated simply by overwriting the .xml file that contains the layout. This enables you to customize Start layouts for different departments or organizations, with minimal management overhead.
 
 This topic describes how to update Group Policy settings to display a customized Start layout when the users sign in. By creating a domain-based GPO with these settings, you can deploy a customized Start layout to users in a domain.
diff --git a/windows/manage/customize-windows-10-start-screens-by-using-mobile-device-management--mdm-.md b/windows/manage/customize-windows-10-start-screens-by-using-mobile-device-management--mdm-.md
index ef4d46b867..e5aebb264f 100644
--- a/windows/manage/customize-windows-10-start-screens-by-using-mobile-device-management--mdm-.md
+++ b/windows/manage/customize-windows-10-start-screens-by-using-mobile-device-management--mdm-.md
@@ -1,7 +1,6 @@
 ---
 title: Customize Windows 10 Start with mobile device management (MDM) (Windows 10)
-description: In Windows 10 Enterprise and Windows 10 Education you can use a mobile device management (MDM) policy to deploy a customized Start layout to users.
-MSHAttr: PreferredLib /library
+description: In Windows 10 Enterprise and Windows 10 Education, you can use a mobile device management (MDM) policy to deploy a customized Start layout to users.
 ms.assetid: F487850D-8950-41FB-9B06-64240127C1E4
 keywords: ["start screen", "start menu"]
 ms.prod: W10
diff --git a/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md b/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
index 7e41c8fd36..2dae2ce2cc 100644
--- a/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
+++ b/windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
@@ -1,7 +1,6 @@
 ---
 title: Customize Windows 10 Start with ICD and provisioning packages (Windows 10)
-description: In Windows 10 Enterprise and Windows 10 Education you can use a provisioning package that you create with Windows Imaging and Configuration Designer (ICD) tool to deploy a customized Start layout to users.
-MSHAttr: PreferredLib /library
+description: In Windows 10 Enterprise and Windows 10 Education, you can use a provisioning package that you create with Windows Imaging and Configuration Designer (ICD) tool to deploy a customized Start layout to users.
 ms.assetid: AC952899-86A0-42FC-9E3C-C25F45B1ACAC
 keywords: ["Start layout", "start menu"]
 ms.prod: W10
@@ -21,12 +20,6 @@ author: jdeckerMS
 
 -   [Customize the Start menu](http://go.microsoft.com/fwlink/p/?LinkId=623630)
 
-**In this article**
-
--   [How Start layout control works](#bkmk-howstartscreencontrolworks)
--   [Create a provisioning package that contains a customized Start layout](#bkmk-domaingpodeployment)
--   [Related topics](#related-topics)
-
 In Windows 10 Enterprise and Windows 10 Education, you can use a provisioning package that you create with Windows Imaging and Configuration Designer (ICD) tool to deploy a customized Start layout to users. No reimaging is required, and the Start layout can be updated simply by overwriting the .xml file that contains the layout. The provisioning package can be applied to a running device. This enables you to customize Start layouts for different departments or organizations, with minimal management overhead.
 
 **Before you begin**: [Customize and export Start layout](customize-and-export-start-layout.md)
diff --git a/windows/manage/device-guard-signing-portal.md b/windows/manage/device-guard-signing-portal.md
index 87e5296ef7..21f2938875 100644
--- a/windows/manage/device-guard-signing-portal.md
+++ b/windows/manage/device-guard-signing-portal.md
@@ -1,7 +1,6 @@
 ---
 title: Device Guard signing (Windows 10)
 description: Device Guard signing is a Device Guard feature that is available in the Windows Store for Business.
-MSHAttr: PreferredLib /library
 ms.assetid: 8D9CD2B9-5FC6-4C3D-AA96-F135AFEEBB78
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/manage-privacy-for-windows-10-in-your-company.md b/windows/manage/disconnect-your-organization-from-microsoft.md
similarity index 99%
rename from windows/manage/manage-privacy-for-windows-10-in-your-company.md
rename to windows/manage/disconnect-your-organization-from-microsoft.md
index 9bcfcc3097..1657c9878a 100644
--- a/windows/manage/manage-privacy-for-windows-10-in-your-company.md
+++ b/windows/manage/disconnect-your-organization-from-microsoft.md
@@ -1,7 +1,6 @@
 ---
 title: Disconnect from Microsoft and configure privacy settings in your organization (Windows 10)
-description: If you want to minimize connections from Windows to Microsoft services or configure particular privacy settings this article covers the settings that you could consider.If you’re looking for content on what each telemetry level means and how to configure it in your organization see Configure telemetry in your organization.
-MSHAttr: PreferredLib /library
+description: If you want to minimize connections from Windows to Microsoft services, or configure particular privacy settings, this article covers the settings that you could consider.If you’re looking for content on what each telemetry level means and how to configure it in your organization, see Configure telemetry in your organization.
 ms.assetid: ACCEB0DD-BC6F-41B1-B359-140B242183D9
 keywords: ["privacy"]
 ms.prod: W10
@@ -1062,8 +1061,6 @@ To change the level of diagnostic and usage data sent when you **Send your devic
 
      
 
-    -or-
-
 -   Apply the Group Policy: **Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection And Preview Builds\\Allow Telemetry**
 
     -or-
diff --git a/windows/manage/distribute-apps-from-your-private-store.md b/windows/manage/distribute-apps-from-your-private-store.md
index 1c70487560..414a19f67e 100644
--- a/windows/manage/distribute-apps-from-your-private-store.md
+++ b/windows/manage/distribute-apps-from-your-private-store.md
@@ -1,7 +1,6 @@
 ---
 title: Distribute apps using your private store (Windows 10)
 description: The private store is a feature in Windows Store for Business that organizations receive during the sign up process.
-MSHAttr: PreferredLib /library
 ms.assetid: C4644035-845C-4C84-87F0-D87EA8F5BA19
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/distribute-apps-to-your-employees-from-the-windows-store-for-business.md b/windows/manage/distribute-apps-to-your-employees-from-the-windows-store-for-business.md
index 17b29ce854..9d3638e9ea 100644
--- a/windows/manage/distribute-apps-to-your-employees-from-the-windows-store-for-business.md
+++ b/windows/manage/distribute-apps-to-your-employees-from-the-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Distribute apps to your employees from the Windows Store for Business (Windows 10)
-description: Distribute apps to your employees from Windows Store for Business. You can assign apps to employees or let employees install them from your private store.
-MSHAttr: PreferredLib /library
+description: Distribute apps to your employees from Windows Store for Business. You can assign apps to employees, or let employees install them from your private store.
 ms.assetid: E591497C-6DFA-49C1-8329-4670F2164E9E
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/distribute-apps-with-a-management-tool.md b/windows/manage/distribute-apps-with-a-management-tool.md
index f12fe10078..8483992273 100644
--- a/windows/manage/distribute-apps-with-a-management-tool.md
+++ b/windows/manage/distribute-apps-with-a-management-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Distribute apps with a management tool (Windows 10)
 description: You can configure a mobile device management (MDM) tool to synchronize your Store for Business inventory. Store for Business management tool services work with MDM tools to manage content.
-MSHAttr: PreferredLib /library
 ms.assetid: 006F5FB1-E688-4769-BD9A-CFA6F5829016
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/distribute-offline-apps.md b/windows/manage/distribute-offline-apps.md
index 780690e861..2dc4f5ab1f 100644
--- a/windows/manage/distribute-offline-apps.md
+++ b/windows/manage/distribute-offline-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Distribute offline apps (Windows 10)
 description: Offline licensing is a new licensing option for Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: 6B9F6876-AA66-4EE4-A448-1371511AC95E
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/find-and-acquire-apps.md b/windows/manage/find-and-acquire-apps.md
index 2f4f2050c9..5b9761add7 100644
--- a/windows/manage/find-and-acquire-apps.md
+++ b/windows/manage/find-and-acquire-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Find and acquire apps (Windows 10)
-description: Use the Windows Store for Business to find apps for your organization. You can also work with developers to create line of business apps that are only available to your organization.
-MSHAttr: PreferredLib /library
+description: Use the Windows Store for Business to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization.
 ms.assetid: 274A5003-5F15-4635-BB8B-953953FD209A
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/how-it-pros-can-use-configuration-service-providers--csps--.md b/windows/manage/how-it-pros-can-use-configuration-service-providers--csps--.md
index 3b8ad15e7c..fbb7256b5c 100644
--- a/windows/manage/how-it-pros-can-use-configuration-service-providers--csps--.md
+++ b/windows/manage/how-it-pros-can-use-configuration-service-providers--csps--.md
@@ -1,7 +1,6 @@
 ---
 title: Introduction to configuration service providers (CSPs) for IT pros (Windows 10)
 description: Configuration service providers (CSPs) expose device configuration settings in Windows 10. This topic is written for people who have no experience with CSPs.
-MSHAttr: PreferredLib /library
 ms.assetid: 25C1FDCA-0E10-42A1-A368-984FFDB2B7B6
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -17,14 +16,6 @@ author: jdeckerMS
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [What is a CSP?](#what-is-a-csp-)
--   [Why should you learn about CSPs?](#why-should-you-learn-about-csps-)
--   [How do you use the CSP documentation?](#bkmk-csp-doc)
--   [CSP examples](#csp-examples)
--   [Related topics](#related-topics)
-
 Configuration service providers (CSPs) expose device configuration settings in Windows 10. This topic is written for people who have no experience with CSPs.
 
 The CSPs are documented on the [Hardware Dev Center](http://go.microsoft.com/fwlink/p/?LinkId=717390) because CSPs are used by mobile device management (MDM) service providers. This topic explains how IT pros and system administrators can take advantage of many settings available through CSPs to configure devices running Windows 10 and Windows 10 Mobile in their organizations.
diff --git a/windows/manage/images/priv-settings-table-1511.png b/windows/manage/images/priv-settings-table-1511.png
deleted file mode 100644
index 5a635c240ad30e0bfe11d40670a2a1360241cd4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16377
zcmZX52_Tf;_xB)_lFF7P*>?&P$-W!gFqR@qqA_D<Lb6wsof%6rb_UsFLW5|x_1O2d
z(5P%_%98DU_<n!?-~WBz2jh9pJ@=e*Kj++g?!C{QSaUN2W+rYX2n50mGt@;uAhZDZ
z7j>Ktq-32$62X5o7=(c~q`HUqJNR(SP0LgZ0;x?tx$8_1KA-S4w8cOmr{5p`(WFbA
z<^d~E%uTHHz`}Fq&hhi}3keB{D?b+3O%vBmmjo|;yp(3Uv_YOUtVG7BT2?dmvRQ+i
zS+9cSYp8YSRTr|dHE`|L<TWH&1=Xr*`%xABPR*fR{mziON0)}ztR{FFwQ0J&)ASzD
z@}1Q7eyi>MUg!Et9ou>x$2U5DW4fM0x_;eym?8ZeFAWR~3~d?=J^Nu+y|92`qrg5B
zYpjX$TQkSk77l$@QM1;!t88w+vU4HYJ)qole0<Y|Xn*U8!|enI*E%Qga*cO#uf64(
z;*3mp_Wk1QyKvhr-33K(LFKrj^Ig4K?|2p80YBq^A(2RwZzUSM;{Lc}8a(gTd&m6p
z4SwSn{p)TJJ}9Cs6uhF!!VZ7SA3k{SD7G;+Ha0Hx4K}ki9lWwWWoBmL@%RGb$HHd=
zrQlWGURG9CRaseG)A9UyTkZ4bjpR?{SCcKT`rF#tULRh)@7}%p*g4(N-rmvmrK@`!
z=$RTEUK$(wJUu-<`<e3P%lzEj!rUBXer{oY{_FfaWnp3Q>jLHLR|<u)NTGbAP<~Jr
z7s0#5Z;OlHm%sn`^W(?L($ebE^3Ubv<)3Rm|7`r(*x2~H1O9C9fS<eIFL?dk-`_bn
z*gZJdKR7s8=6v@K0#VC`>1tWsn^?}-#4TTCk7kh%?&RV~<;?i-UZj*=nemde7F&G5
znOjU}E=Qm3B#Nx~cW$4Z*@JI?>GIypS`BP&-&@Y@uOgIJbN%7^{&%TJYMek*YUpQ6
zo4_U^YjF9zn*_o>2J%o#jL$8eU8U()8H(?wtzdsP$_y$-U<G0+x|l-ce;?h>JXC)0
zOR*o1+VI6ViZg1MU?6?<n4b%uVFKCefP5&O{CSZQ$SKFGbomB636q~@jBMK-HM_IE
z#F~5}A+pdj(oMnNzBzSRD@~iR^`NgED}=xooJZxxV59*D&QJH@J%M40%Zd41eHlyj
zoPfDfi;M5)%q$Azn4k*-TC}dByZNz_2imKkScfU;RON3ghp8;*Cv5uMlfkAp1R0xY
zUI-A>`if($Mz<&fo-pjG8<R7R{c*Pz=omCFD1OKm1*)R41O0An^fv^n3~eDz-S;Df
z(3+R|l6WH@3skBG<se0RE}})5<u%s~j!DI6@HgckPvY%p=^;!rf;S-YI20tKqusbw
znNGibUtDid?m0x$h83-I%;hGhO;gsbrv4QJk{l#q=(ri(y)zI~h^E%}eN+rOgWT~3
z8|CxLR*IHaD^)wcLKpK*w*G<0Nn@I(BCeQ9=oyw1wNa5`0W_Yo)*(=jtAeFg#-xWz
zc0UJFkvHUhbqa5yPxlee9*=_vzP=gCtVnsQiL<y_x#pREMexQWNC+Ptqt3CfTF3NG
zJK5ba4jP$G^oA1(It^W(^<=RNum7ZJx&ZK1Xwn@Uh<kEt2kIe6#}eeb9Z?8vPNLjk
z))#znZquTvBFkZt|Mk7A&I8}}iDO0MC_UoTHGn~Pq5-V%fa~0}qf$Hi{TIi3f{Z?A
z^Hm6H!N(>X;u-HTKA3zGWm8z3&G>-k1KtR=!8pKc_jaycKE>z8vGame_Pl^&2se`>
z-Ro<Be#{qm1`<|dG5^YzCN51B5%Xj!4r!`uS0igXsrlMcKisR&-E!JfwZ(F%-}7w3
zX<xpf0naCfc!B<^nNu>XioTb$jY*82MEsMqX%oG+ypJhz`u)MDUSzazyHxsjr5M~@
z#LRdGjq3F)R{mUa0Y-|rAZNt%I1Na%r!OSf3r=W~RGbM_o}3BgS;c?jzg64&e+6!P
z$pB$I?4zQ0?nk5Z&JEa2vI9n`{jO<pLsSYxMYt&)dGg{SN8>M~pp@brO<fywy$YQT
ztk(ORDnpf$N^#3@ssRsc|KGbxO*914=0N^mz6{<#R@kD9P>V8u%Hx0mF%|<p?<=Qh
zzgaCI5yxGf+xw-ZsD`9y5f)RXg?vMp!(<WJ3o>6k6F`uDK2FtbF6R2_`eM1@ZU9M$
zSwpxfjQzL{chnPFtLsXSAyO2vn~L73K<!D-=%{n2cu&!bGeLs+kCoL#Qv%&ec&1lR
z7Jun{^8)Ij$HyP9$sw@X^WtR2Rf4mRO`S<2f{`{q5dN?uk`@wH2xWY6^O(zf*Xkq@
zzbS{GSXTNM3LX{YhP}S(9)N=Yn>18_yk|ZpBs%8B)vVR;5W?+vO+qcE@i<dm%v<IV
z=1DiPX+@RfsKg7S`Wu0Is;#iDhkc3OpS86*;-SWmJLx7GL%7R}m6MQdM)R+mFB_Kz
z`^()iDD|*X3VNyUbl1tW`8(fOhUs#JpBp&vNUtky`J)}1Yn9l6uzu1W@oh<nd|<qS
z12aJ;Qg4RhC<%DKYR!tF1oVeNfeFvqtZ8NkX96eBcdlzqO<acm|DeSRF!t@Hf`gro
zFu~GZo&euVPR^0BS^m~lS{Us4b+x8X<iF#bY6y0J|CNSG?)o%=QHrHY_Ay214u5}(
z!v1CvTx01mt6QicRr9NwYo<0eRXznZb0K2ySH;Ek^)}P2buHjs+GeW5aloMKH9eZa
zS7_1}GY55QYrVghw-&J+o4ogJO*VTym9Qh3oSBmdO1`B{@EH1J8cas*Z(eWxlf3a~
zt?egPOl|*RTdVKKcK6k?(8y(b=tT)S%Yp3Sbv;>*9BXlit3BN_yagTk>b+ojsMAhg
zciWa561l(FIJ-aOroOt@_VV7xny_2hl-w@HjvhVgSmjJ8VM(=BoQWdu(o^>hpvR=k
z3AyM4)&MiXvH;(<LkNnPV;sdt?2<WE=gG;zvo$3hTZTYbdV6<|4VqViZm{2;eOf7c
zuF}q$oB3(~WzMfniI?&y2jTk;d7*pP4}Sd_Rom0+4IT=KP=I|ja9^!ZbqrJ_B&S84
zKqt*ixu%X*dZROjosBWF(d}i+XjR`)wV>JUm`U%p`H`D5m;+s|h|kp_tF2U^aXP%c
zs<DN-|6QC*MrAhl<IBn(bEU?wI*ULmg~4<-i}Zuog5S=%wD*(8X(NtPV<mNM>#Hl*
z#bR>XuN&iBLEn<nqB>Es{g+3Jhk#&R#R@VFX1s`;F`bMn*q(56+M2koejvdTvD91I
zy;a|v(8pWb#4VvB1QgX>qXX>eI$YsG9`W<%xHvUy3(2&<aKDiI;}yAkEn*tKWj0Om
z>v9C4G=r|5;LQa?uBQnU*2FKuVe|d)dmUNf*StO&ppq>3#8j4Ey*`W_)iVcwhaS#u
z;9?cjwJ{05u8!NH)e#Km0G;*HwOzko32QaVM!{*zExm^@a~3J@J*2Q@E*^L~(fBw%
zh#;2!u`EtK%Edm_WA<W~&Vd=Z>;pw5_>c&fR-EsQ*QFW~mfq#=^ZrSTAbm9pc9g+U
zK4iBTLVb#r=^}q<7W*&Z)9a?zmx9{0(T+Wb6#@w!Nc~h4Uz|{m8Vm|IQz$~pMr!8<
z^>kljos`9sMw*r?j}d55Pn8*sWFbS@-4+$+#Oq>sAlAFEm<<=KwfIYh*UXXGRHk4$
zBu8`{Sxd;r!LzvbDULIiLPLl*;$y5j&#dsW=P3zGo@?<;HXjxzKY~g#A&2ZU{IwM;
zUUn^fAE^7nJqHAcTx89l+A?#?V%90V{&gZ1FBz^YW2|5JI7k9ZVwb|ZV<{g7?EObB
zU#I63xlTXIHOhri#UZTbfQn0oa{VK$dJ?BT8qt|<;+`OFKFrajQn2KxY@<&e`tO3L
zTLa3V7nhb{h1<txPC>+9_9)kod*))_a8FCt8er%kPoSBQg?F!Qg}S>8G5s=^70O%}
zJZ&De&|HT^65<a?L9*oP`D<*`ktIc)&-cm&^6j!C354$4?;hs<*=x#Wy0uSrXd1l*
z{IWG2GtGHry}ZKEBzd6XDW?|Ig}`Gr`x&8d8=xpUr8K%@4ywg&*OTq;=uNw0WJ@RP
z;ZCQ5pe!yeNEzNs4w)3#Dy(nUhQKrQOc>Vr;fbjc;mkc#jG}yestH?0tG9kpVeN7J
zaL?3i@y4d^B#N)wT~H}0v)Y&{NYU#H&7*kDS9{;N4i(C1FdNIA9h~B%XMV=4nb~CQ
zE*<&XO)@309?zs{s5OJ~c9_TdU3c{&j9$L<fYJ;NxzOI%@+kN$lo41{9%llj@j@ed
z>rWACP^am|^q*Q;WECm48wsIK6CP5OOcBJbPgmWDTfB06sdEYs$%gC7u78C-xG`Wn
zO183-znFVXrXAd#!W0tibDHwPM)&3J92EmgrCU>zTU0K>8Z(*0TwMnP3d$e1jO$hE
z->v+^CZXPHUuOX2Je!YYB38{ld-CVll@TjXkyJ@YomN5fLp|=XM5*sGg=7^7*Rxj_
ztt!)B{Mje&2jWUJ5TVFQXa;=Uxm+jNoge-x|4etGQKgWbOjKa@jgZpgmLirOx0I^g
zS0!w0vMg-<V5H-C%ZO&!-~sW^T_WtyE}9dzuG}XQVxQF+Q+>ev*ysZXPg!ECt4F|U
zdn{I__P7V~9nwC^8d1?;a#jGpL=T``jcXVh_C!A{j*eIox3>H{!?hGDs-zNbvvWW+
zE6{E4^*u_;XbnAM3q8jYD(vIqIMk}LNV$Vk2q&fMEpNfb^ZGsZ{==4c0dW05F=yv;
zI@XKwey&s8IJ8K3IgG^G$y@uY^k+*_gS}>YY~_6Z=GEn%He26rhsX75c$98s_fKu|
zMOJ0C_t5bG4SzK0WGLyv#u;9hXt18jo2oakv?}J0-s@u;0!Xi>TfQf=<(+`m<j!Hh
zG0hxP40$#-8*G4~`30FZ@!I*~x=f{=kma@gc%jMLd0Y+a2d9fH*$-qb1+f+F+f@Ud
zb8bZNgBugzgqxdBpct;>-`W$m-ak3J+F82aY0wyccZm_u!hoRz{-a9a7CMMbV7NSf
zmkMKtUWAh<>F7XL1U+!6zoj{Lm%rkXs#omE8_@S%P!;*I2NV~yclRjLK-9W#7fEOi
zx!tLPe1zh7QF$W2-XrCF`IG)rA_Z3@`1LV52Tod~w2MeR_1jopyp<NU8NJ%CTI^{S
ztKFHPs2yt5S_xdKWwUv5XUlccR+T*j4d3p(iu#w=gH-<}y-rz#fa3Y=F*6Xfu|(01
z%MTK-Fee4*jCx*Lk<cLXLSacJ<@v#Uz_di|m}XHham~IutKik9EtMh6bh406ylqM}
z;-j$gq1|Qm!J!qCqm(6|D6E0Iu5t~4zsa-j2Mswalz?_q(w5PDt%EOjYOAt}pT9jP
z+ZaGff{qoT!@IU)P0H7b$TamTA|V8Wzh+#UPzW)mi=hezQJWqVpGQtB^haPsI}ZVD
zi>Hk0o2sHh)4>NuK;zUQQoPUu=n(`S(8mv0g-pt=_3thjc!h8N+f|d{1E)4!2kP&p
z&9Oo+%E1(-aInz<i#T{+XooQ13m0`THjq$PN6kd9OkGHBqPEN4&0O4F_;1nDpy~$o
zy)Bg@1$DY0buo{~wc1Ja_%8mToes!ABL<ZERo|)M@5)>#-ny4>TbE9`-8|+$`80zF
zL1@(-w=ng#h78$5R?3G;%oE$kR0?U>I3U;RqU6WTY4EE5V@@(1!NZ*x$A&OWy#Tzr
z(1R#WsoZ2GA}pTemm#vWt)HP^L{W^YJW*E4cj)do>x5sSE-b<bUvf>FGLjIXs(tp4
zOsd>=&@+SCr~vYx$FARmN3gR`PhOh%9m0c3_4})Z0hYh3g&NFLY5rqB4WK({BC+%8
zcgTvgA%~i^BEeFn$Ts-UPH6^_EP8Kf#ZR^@`5cPGe`^#k7}ef+YwIOyE06bZ2gmPA
z=vM12%VHUsq;kL#>?RJ~Zs{5M+h+l0JR7UoFM8k#PBLdODpc9YdYN4^<dfA~E8FHf
z^;KEjrKsGwf6X5$#TRD8WI)CT?Qf-q_pt)fS%Ye*87V8&C-*N=rcv3F<mOU=-SdFu
zzuxPefF9g_!5+b&@$p~mUzXaw7x`~F7W(+b8KEgwgZk~8QkFxM>o(l~>6e&3RTnI8
z@zz!OvZOA#zmrfEqjf)5#Dz?k-%^D2_*v+&uN%soCF2%x$wIgvuX&4_p|gST)g*$x
zaq1O`#7r4|QW4ul1JPl5W&KTb>-XHL3xptOskO(y<ZFlI8L}9P2*D!|+|`CG3lisd
zzU;@ZCY>VCi$ABkl4=skXZ-(ir<q97dtvk{*Bo)Nqe||WPU4L%7R=o7edW8wU%+Tf
zh1HuR_0tjHtDOyhB9AwQFJNJIH%Z@=0f>23CYR0l%{n)|<l=wKcE|G;F+%gESYMnj
zKc!V3#g=fdeugg0BFp&z-TAFCu<s#yBW-TJgJ>tx{_QOAPEEir!oI6a@n%`8ZPv=#
zkXekC=_HA9wgB@Fm+-$_+<G0_5>xhP?f7ri`D&iLs$69Iw@G<305iaj%5_GV9wDig
zo_O~ZkQMSkAE}u@S&cgm@#c&Bu=6{F`?=7${O9xaDxz1jk#GrhaD=(ypRhWxJ7b}d
z!FOPNL=o{%P}jvsF7++{(`enKenwPJ=`1<(FinCkagXLLk|OB5i9IViEGg9VXFJI4
zv(6GFUl~lz4g;ZS|KxD>alfM+-nQ+^NZ<s0zx%5*L+&WmXThvL!pHgXk#{HHs;GwA
zB(R1?KKU*|N^+bDhn;vpi9e#vmXZs(fU=F!oz}lv)a@G|TaFVh_EpA8e;v9ke4OBu
zc;{1m{x%KpDY|(1_8yxAs#VVBP=f)KwJMFIX{=Y7<&&Uy$Rhv{+V|;P3{MbzLeK8b
zo&zo0O+g|j<%&}4%?(AF2|fu|4*BE&=4hn8h-Ik}ST#xHkR%H@w#z{;IXfN$GfIeA
z!voM*r+(f6?F3)={yne#k!##iiAQaJcnCrGox{*R<b4MQjTkDN6*!UpKrlM4rVxw_
zc;7BJz~0~_7(dpKhxm3Y)bx;~PhhX|5JPyL?7Niz50e?83S)-z5@O7sIQ^G-`0ah7
z+eV7H=I{p4=$KU5x$%a6!052soFL2^QZJkJZPeQ;@W}IU8_#TT8X%*`N*2<Y6S)!z
z4J)0aw&<%zj0Pa%z!gB4G;pq>L0)~|_lA_K`^6{u_x=B|_+lBLuW)&erWe%%ktA^s
zvtL}?4nc%IpfuKGDO?<)Oc(6I5f#9-9`jlbAor-C-`;zAaI9b2A4lnm>&hOZ9wT!D
z@UOrl*dOc7tj-YV=9Lfh0MmjM{$$EBThsafRNL+9$U|=7Vg83X;V6+vs2@hipzk4}
zO&=qERqid(?v8F__z*>@2KwL-+5OXm3uG~k@S*%|pTXr0we1fE%!C6dkTivx4IR?Z
z!@#siLYoWQ$$tYxhqs@dZ@XvUCHlQfZJXudpCyy>lLS`StMJ|4fy1gGY0^ZpkQT2K
zUtXp$lYij0mf$DcnJE4@>T<xbaoS^1oP8%o&U`$6Qw8EMVb@2jQK<amBPsOM*0u=0
z+O?V_Xv;+-?H+Vrv_Z2);D+t`mPOq;AUsPo;w>r(_fdPbbGz}c|KQ&<=hE4U?xpx!
z53#mo_@TFH%Gy`(k(B5u9M$K~R})DnLZLpzG>~A5>xxktdqm8T8fd|W`2VeHotg23
zia}E5XH1$sbnN=~zx*UXYZh{|!zwPhAueoCRxJ5RGpHWhiWMMpm#qV*-hG46>n;x#
z1`y(>P(7a$DTGHmUdJ+t!6KUr3pc}*api-bPVrA(l45~cCiVaNr(o)4qEEvmLn>%7
zxse;{ltM|L!dd!UnZiAL<_ou($#VO~JNVac;5ayox?V6Yv?&aBasz3s0k}-yg|gTR
zCr{z>gU=Gaj#`|x-dM^CN&H*BvrQJ$qV7Vw!_}ylmLSW5(2#}PV}Mkj{p?i2DDg;$
z<0A_8=@n<H5z$VSMdocOtvM2+L|{!pU&^5z6PB-_jULL5bl2e*;^;io>G%kFNB=7&
z-SCdKOP4fyHatKH(f7=#5Rq=8kLf0|A=wn6?wL1srPCJ|K~)}o32(DshKQ)q782Dj
zG+huinm{phX2%8w4fJ_(u6VSiYFPiZt)ugYKcI-H(`Tr^o_dAl0Y0Ui_N0H_KLvr1
zJ81&4gaCId4^cc5Ps=^N)R1$~n&(P`sF~NQeI}ImqDYU~HQ+@h&fC6hVy05RmQq!p
zd2YvhwX>~F{m|ei6hMkxM7BF-1aqB0n{AvCp6&q%FjpiL*ZRivcB&k-`4E(o{YRR|
ztF?^GnetTtwjG+t9#6V_ysb?6jg_;8B*?s6{KBF3UQ_C5#$NF~{a?FJLClp=d@l_7
z4uMWP%(U#QFsmUecBlb8U}2$!v9jvpW&d*p+ReyUTOaH*m)yhvtn{e$Yv)chP6~5=
z)~5%;#Kj|GC}X%HWC7WGzLS<s6cPb3Omp8i6yo7mUTZyJ`zIIaj+8WH-nhUoxf2>g
zTecdMps%N#2YoL)x;D|-s$^Uo*nBMAi^risve81Yh<th6wAZ?WaHBlH*j0{tIdJWn
zTPTy&H&YdIkuuKO^D;E3%C({;C!MEb!c8{|nEkGP-Mt8~T_mS!{P>!OezrW(2}kve
zqe|vplYR^Aj*t{A<p>y2Ls3Y*!qolbXV1j?OvYdDNB~`4qGpZnKFaLY|Iz0GOv@+6
z+J;slu;njq{COr8$|SvEU*sXSAyIt+?Y%ekNiC^r?lC-yks#5T)LEa`q+kpEP-vj`
z)so*t_sR;9HnB-<@VNoshg|eGc+JNx4FXAoTL>nCQ|nG*9I)tBLAN;Nbv1jgU%5Y|
z3mt{Wj_&xWNV;DJCN1NW*FLS^lkLJ&%zX>r5(&kEn~z2vqTu07r@;P_AIwcqLxj$(
zZhz@nYsev%&N3YXd@>B;dPCGS#<rsxEPwyL8I`}i^2=~NxN))ln#Mq2Om4W;<pd-^
z8dy%9!_+Mn<@7dQ7##GW&qmvPE_nQY@QB{9_%KJKFVGO)#_n4({vx&EGQcOH?iQjx
zwoT{t7?eum1ZFhJd{u61l&84(bQ)ok_~rkWXOEtVNMn`win3yNe(0}MTv9wP^kLDp
z*FYuDN2LTb_1?hLBO)Yyprf$aqFA_irIRHLd3V5#8&tG-Uwvx(?xdF5p3UnBp9~|&
zYcmW31j@5!0x2mO7x}Pg)!VL;=cQ5(in%(FZB$C$fw#X3W;N+r4j~!G^_Jy|sXOe2
zSFc3y&ioi-_a%}Ge?NT0hh8;E7^!-5ZF^=JJBKM*jO`JdJiYY2kv1HfWnCP!7%O@6
z_AR;~OLupI10vMyx9Z@w{iNTa5vde*cayl@*j%@3c^)d&M?kNogFw%#!2{HX18;#q
zZSevEGP=<rb$v6c@Al9BXHYxJ+%=li52li0l($6g+FeeivTRg1J?;l)laJYUKR(OK
z3|ixic(u;#lsEh|kMa)zg?I%4j#wQBh(Dl<;q2ZFk3_RvA;nBENUZ0x_InM%sMeRT
zue#K?qSj|s1l<I>MYGuIX@n(Q5sJbMTJ7I1m*qwb+~_CD6D&o_zNUzZ1Qd})v8JB6
zvgs$#|5SY-YF%ne*jow=Qjg4`6bkc*mTdnJO&?T9q&F?UxIxiht?QHzp?)=$yhz}L
zmL)ABSsSUMS!s8#DlL|w1LexXH|5GgE5%p{qY7ng5J^lM!YS%S`!C*Hw0P-}C>B79
zU?pYs)Jg|+8s~oIpC*BKr-189WuYJqe4}epUb>f_jNW@X!g3VW?**en=K8^f+}ZAn
ztFeq2a0AA5`<>eQt<_;fD5Y3=iWSsnvJML~kFX_x^!(tjY<cPEeQMUjkY6%WxOB@<
z>2fi4%`7fUc8IM=ks{=d4an!GjIPX{8(b+nc24{4zJi#ItGtqpi81D-7$3BTFh@$a
zDtWt-mkpcKU+>7e!siFy-)?L>n6HW0UNN4=Jq}Ty0yV=4eh1D!HA%FP8_~kWy&Ao+
zqxzS!=17y48mj;@?@YjtSNMqVAYXXv<B&RJ9DHKAj1Jg);tW;Fz@txZzJExuwhWy>
z!Y`nZH2L}%hP&=ZjZmJ#X+a-{%)POHDdvI#`J%}Z)3}p;s_)|3Lowj~l!Y_m!%S%Z
ztHXKlLy8{S@t@5HB@Y3dBuJXAjs_R><Ea#)&+c<T<!n<5xQcEbXbE%98BhtM6bB!&
zZImeET+;*4fw1*$#drfYXkLM>7FMEk^4VEq1XL6v{2`%S4O`xRy;u;^xslMhm?>BG
z0O>>^an!-&2q!z<KF}`5+8WlXY|3EESJ$miBue1+GW7>q4wb14+D8u!pc}sI2`+!k
zhZ+e4pIjdoL?8r=>k=-ab<i8e>)ZDajVQ*KL7xwL+Go7rdWet-VD>5sj<5Lvb^Cn6
zAdwT?QvelubOjeF4<}M4XYAK#N5UJFlK0pQOWE?)Ebr-RQI!c2pY<_k2l^T?7(tQL
zauwiasCDVK^7rbR!|j(=DCab~A%6vHC{Lq}@J}A6?5p$z5^QCnLoNeS;C>2;2UyEA
z@r6wrgAd@u&{5{FT3(SdF&dnfAj_VPB){7BF#Bgo$zo58Zx++RMm<30={3C!kr(F@
zM+Mp*5{s}=HU-Ml)8#ddHAc(h4traTQP?)uRN2+sPpPNCspsw4Ej1JBdUETg@U@F=
zqPw4T4PJ^l{k3t*KuWlx)uBqt`_4)Phbdfy%zUm1_7s#J*n66<Y}-S)VGoahMXqMR
zG|;XYX*A8RREul`EW9{-G+UWflmzPK>s#SP`B>{pm!;9XHKzE5-P$AL4CMRRpjn1`
zdi9+zJ)PC}^g3^6#PXr_k!KO^Q4ZH<9!A8aZ2KlCeoI7h)N_deCa70$ES%9>`~YVV
ze0BCmM6ff#mjA^%ykr8LFRsw<z>0{?uf`PvBv3h&2Kdj5x@mEu+FdI|i)glYjmc&{
zE(5U(2AfEYP1gsfvaGRD$lwx-K550v=}eF@rvVkH5H$&j4uU>(HRCCoCYOi(e&HdL
z^%kq4Lmi&RabcrMg0)M>Q5h3-qpMEgrkD>0V=9>o9e%=3nz*VTR{RzmadF|eX%8`8
zUOXQ@XnRZ(k%tfwsXc*B(sK(!N@OvF#4$a%_w!c<rOR{zzAJyeAt-8f1S39ol7o<#
zCEPQOyZa>MS6=r^v5+hHoeiM2+WC0nmGnEs4_yNX+6u`9-sp|SFa^o+j5BLkSVOiU
zWvD)*Nm5$lTh{hHuuZP{uvJ<bF<}1ZDM7~_V_FVE$n1Iyl4C0dNx3n2yg7v#Vv{?c
z(PxNUv+LGY=w=y#cC<H(EsD{Z4x&T1Gk2RbEgbhQ{)%sxEBlo!HD=SQ0b>b*_rMvz
z^~$BLhz#3<-8+6MpBAAJ>rd=gJ8K-v!A0KIY{Dqp>u@4DEKKt8h7y&m@G}Z2ag|%X
z49QgvlmjZ)nERy(dem&F)CU9TY&5cX>j`DDuafOze~X*vVEDNo-;YX?EgU!gst5mC
z4h;9QiAzQ~N_jP`4eqMI9l{l1A*?~(NJK0JK$ZD)8H`y(viu3)^<P4278k5tw405~
z&*R&~*p(I>3f*9;oqm}T-P!qenfNsw$#&n-gG!O1URhm)64K{{2<=|>i5Kwrgq%&6
zOm)S2<sZK@DEk@P+!B5>gpaN7b0+atg~15~!@>Z>d|KpKXA8q-s44Z_CWa3%T0aZ;
z@i0PuD)A;ye5x3tgh}@AnMn4ls(ZiEEUIHK(Z2s1&@Xu##|&&p079#ax<?wx=1-Y!
zR^E`7;=#Mp|6-VKa2ULS=JV5V8#qKE6fb}?f@;Kqz^Fb(!cKDg!)2|q*6i?BS$SjV
zC&>O#IN@vV6H0TR^rkL!HU>!+E8OmacB`EQTwFi1@<_HtR8VZu86kp%%-$To)s;Kw
z@Oy^<wijv#r=h5)pe5lpE7-4=kgLqkx34jS)q_KMi-=c=gXU<C`th5>JLhe0P&Z7#
zvnGc^V6x6<UXh+_Q^)wPT}y0r)3}z1Eg^1ymrySZ?o(AaN;HOaX=7;n?!U7aVz~?$
zlBQVud9RRn$%;i-)T_{-XKKBM)OVJly3`xxPj*^nlrY8Q6qK}D_CPZvWMCi$WZz{1
z&W;V<HZ7`xaz>s$KXLzK%uXib=RDY<ED#T{ogf}$vEBmPfd?^DxRb+_W*gCAidZ0b
zp)E8X2?o?+iLGcls`VrwU#5#m=w*FA-|->7Pa5~56WZnnmxYmz+!8ULYoCe)9ZF9A
zphojqi$sSP8W&c-JP@gy;pw(KWDepK9!>e6R_2NN6fKfEp6QCSGCYrV4dh4zp#m%7
z7e1;9bb`xvjED!H7<BYSAh);MxEQFFDg~Wi0dC2fK%V#6R}R`k#%z)K2(Z~wIUirH
z7~i>>Rdj|_aMFt7ga>Ir8gwzvei~<GTcj9t-Q87-|1VNW-qe_MSfTD|)JNKdX8`mT
z>$D{en-I;|3urg-95Bjts0N41fQb;+bVw%Ui+$4c20Eg{(e6|SDV#f%Rpqd6t^ETV
z=TVeQ9z{tT6bnD1^167o_PTu}?0RAsz!-`~iggmI|IwO1u8AF2=sb0AS>ZOz@`<)M
zF7a5C0OIa*n$9q$BUxIcn*ui_@lYX)*pHyU_9PYLg9ssAERsB;1-7fPC_d<@uAPK3
zuU1f@KhGHM!J4AGg01Cib>pKB%m-D-WXSl$0P$7KPkNnuD!<|VCbYR%_t3|xsOs^Y
zB1N1q4>zoLy2kz1djn6DqPN+lt2syGgP8(rA-v~gPFZSYg;V|atcMgu%UP4d$Sok>
zXj?Ld*wKAf8!FwgevdSDfo;R6cfnqxORZjqy&$9qABAyHLNdI5sVyib6V%r-AdS}2
zS?!e8Y5rrK6;VHU2KY}PMaaVrQFb^&dDJ4o%T$}p3r1D0F^T3iBcaAR>kc^Zn2~U~
zvZjYY)lxt%K4UiWDVG6z!jSh|*ZZT<%g2M1%E9wH1PRw!entu%i3LJLVPJqd?oe9k
zTyW!qebg{t8}Hs+7#4J9<^*pG?G1$x{m&=*n;yykA;cVp!2sITO=l9h;pwiRj5Vhe
z9|pMN8f`zfp_4*LM(cP7yipOZe-ttK_*_(E6<*E7RET6OjvG7-FDJJSFlOL|NBx53
zumw6KHeN7>Im>~dDwA>mz6{kRp*Rj(4lbeJnU=SK19<CcfJLdy@#WCtzNywN9J%#?
z6ktTS=#6;gU#3*T1z~bg`p8FEEIZ`daQfke_7)fZ!dbHYMRZt6_D=(J@tjE`?Q0(Q
zdzJ-oeCgPvePp)Ocg-Z3JtVWR!Y!Y{i2Xg-{d@m1yF^`c#~^iz-Q?3nOrAfGekL9J
zsmH2wh`YnnH5j*#`6#S5MVyEz3o0fD)V%MSKrg%<>bM;if|*q$NP!)&ga>@@hcapS
zuHj}f05)JR^Y7CM-h<PS=OSamqgw{Fk)JY9;Ew)G$w9UpjHQ=25mwf?mbG1=h)Mij
zt1UnLRsZtn`{9QBdHa~RN4i4F8jH!*9^B|+a^v}jlz|<J!14QvvJL5N@B?LMEMG3H
zeiPx-I%5x$f5Ql*vcA-R#&wJQF_^ws<0==(1v^kiWBI%hD=k)P<LUt&#J|JF>;P_X
z*B9qLTO3E}M29!Q>X#6A5NK2fk+62%vH8#N;h-)}=zU5&Nft8z4{wph+{Tr9OSZwS
zr?a^oTC1JG8$c1dH6_IVk(fXDSr|s;fi}16Q&`p}IW?@PvTwS6)%1l5Y%Uy!FYs@=
za_=A+fmYSAeFk8AkF<QjZGIJDyE>Q4`z4llA@`HZ>~g_)t5a6|`ZUL$B}!fR!(yJ!
z6i!Gr_2CpQcsXki+IY1%m^#-(FuG?Qrjbe~VK&nkP0>9~Vf~C}cKz<A-tOFYC4DP6
zzVT$rQ%GM^#IU-}wi@p4|29AaaKPC)ac8rG=?^j9_bpcXt`O+J7txeuS0+N@yAOg1
z>>uOqRY<=zswOH+aeM64aV@HEE=07+&w~K`1H<5$QpgU)a1G|wvM_^=H0D5-n_T(n
z)SwXJetE=Vy4~T{Z(j6?m*r&#p+b0%*@0Pfl4)s#v5m6ShsCdJq1#!>KXp(0!;!T<
zful%9$cy#4tXA?u?IhQQgBM;{(k8=8N;-vsUxw!TLu5*UCyiGD`QU}Xfh$&a;a{*!
zZqF{4kSh~^-m5hu@mSh=NKJoiBB;Ph_MNJVW?wVam2?2VS?cj$B9kXnn>a`pO$G!c
z)DP6&t0})_Rqjy3zi%Bk#T-mV1apO91T6599-Ggyy+6@7LIu0IxY6IUJOpKq)c5k*
z5{|$7P?#l=7y;XC#r^AR`Nv_T1KH=a9o@z>SQQWX{P*LRB~;5zl+JbI<vLFGGHVVY
zk*^2N`CdVl&<JfvhBJSfH~uT8f&XtTS&k{Gpw#bg)jWI9=nqdiLZsxm52au`^Ypn_
zng3DrFpL`Y&ujz9HBr^O*z;O9>}Yh@Ho)C|1kMBWs9gWKIT%;T5>`U+GqoMBerJkI
zUm9P?c&cW+`pf%T{3FEonwugL^v}wUt4ukcs9$%>*8AGNBoE_T?JNv-By`t~Rs@!e
zzf%K89YfOCU>hF2;S1*gFawoSIX6^9fFnLTf;EhWwrX7PW(9p&WDJ57>dt5&9IM^`
zveD|sETO~vU1*AzZa1BOjxfunYrm=#P>`anU%yJW*DTxfj=OEEE|6+r1{G@jnTxm}
zF7t_Br{3g@VVRF_?mzq<)Aplg=~Ws~`jIoS=HiHub>p!rpqYbWSse8?#qfb{gVG}w
z6D+t4M&;HIJQp=LT*;~NQ!TI})CXSVv>%v~X2<?{6h^HwM+J1uSo>xFBUTKcABnxh
z{^>!&+eG93!HMikBgiiqNe?_dFwCi%&T4Npi*|&AUy8+3(4$Cp`Qs;<FtWF3%c{I>
zMw)DaY4v{lzyJj%Rwf;&6w`pBah(Prdx%<BlXA*2egwQxoSz<FyMlh+8rjh6S4g&%
zd@*~LjiH{|Q=FgDoADom6DhN^;Xj#zn+3qP#YfsM71_=SLz@p3uNBz(sQ%{5r1<PL
z+k@|GTG+A!WN_|j9#w#cS9rU_=fdFr7S#SVLdcylX#yv(##iYS1AxR`%A0FQkaV$x
z%V*kP-e+f!GcV(!x8Yw^;GHW-UmLLZ9Z{LJ`x9~Jh5G)C)96}ro-5YFsxKC4o!d~t
zNDR(Cm8C~jBb;O+7hNu4M2{?4Z=M07KGhrF-CS)yaM`*F%pVEr&kl-Gc@xe7Ie4Sl
zn@W}~JmHR3;Q{DBX{CB_BttqXN30mk8|-skjjVB16N?{p)Be(Ilto^?scjzj;2bOe
z*Nosl+eR)=57kW@74bc~xMVjuLU~$dXjS}F^NyRc593U{9Y&#HBs|1PtKcKyJ*Mkx
zZIM=%XMKNm?0|ZH6+j=Yds|zc^DKwpP!7de-jf5^T%)B&=v<iC-f*wSSUFdUE%Csy
z6H=zj4Y$f<*0gQ{i6hl*z2WB51pV>*1~<_bzJ<2wuIIde*zEL&!Clf0je&=7Bk0c+
zdO{aF%xOLHFdt-ZH*Z$_x^;RX<AbH152WhW%;K+S+5HJW{4zIa5|J=rOQ?>AIKiOv
zxh?eIr4Hw>;fYTv=>qtW0jN04Ehwt$)=Rsr#_Rhnijx}o8#LEFsP~{OSZ5NdHH7nN
z<w&Bth@Z)oE#2ECF;?|fMZs=2*U;X!s*+dQAIrqLWp-Nz-tVFZHfSVwnv|0bsr+1u
z@sypQs4If%Hx~U(tozKK%Rrg<t6p2bc==fkknt;RWk~_S%IJ3K{(S{lp<_xheN=^4
zryEe!2Sa4L-N@x*1q+~a=tMAZxI7;nHkutUw!1Ov58vOK*sWUnRu1I=;wgI6qc8*C
z398DMWt)^cJ-+am;wU>lTQV+$>*^%lzcproT3y73rBELAqc%E-{_<sfT!Ci@Dow6I
z=vH62Blm_-lo*RC)<85J2MY)t^M<m_W2cL@2h_Gt6V#4`ip8wxQLoC5s}Vff9v$yY
zv3}pAc-!H*P94RCWL%kQR^g{TkW^=?d5h)@y{1_z{W!y!*WBunaI*u8rLrPe093s~
z2!MxHEYIaG+>&E495U1wU_~c-NoF|=pgy)PKI4+`@&fDC+KNxvWvDCf@!_q^M2FX%
zo2|Luy>vZ{m<CzPbV=7YvKO95CIm0tnn6{cRO!H_`s*unK6S5qFLSml_%DkcT+Ot6
z{#{^E@cGQ;QZ;5dsY_}4RM`#z3WIw9qH18Q;gYXB!n-fQ4nBG&pT+DzZmFyS79g!&
zv6TDqi%+`46l+F`O#NeU2S%t<xLmAR*uKxC<T;l_BT80=p`oRD>{}}AD|n9JLc{#&
zX@1%9>E_ozaxa6gevm_6MMCfW>x>KQJ||Ed_AkaUKQFR%pZ@fhW$xi%M92Lf9*7HZ
zy+4ep{XXeAQ@CTfC?qNgrbbI~&3rUHVV{n5Cmt6xo*cYP;EFtUQfmMA?+{mnGTw^u
z@yhmZ*Hf9x?M6i_j#Ew57fK#pKOr0OMEwY&TIXi<le}+5cG4*-jp*&KVRPa+|9Uxz
zc`}_MU|;8i8c|8t4E4ICJ+m>ki--L>ih<M2lZ|kfW0}iwl;Y2o9(b!F`-+=+5kU;$
zRau-zaU~3eFXY}!_`X1T+4EZHA%-lrhF_0Ggl30wjB?%c{Mlwm)dja^0W<aZrBkX`
zx8P8Zt?%7<RBi{j9XsCX=9d#y%Fvdt?EWrrH1v&cMnCK9tjF5!^=qjib6O-^@7y)I
zUgmHuQqKEv?ifYFX0J&hRvE7MzlADYz4S^Go8r3n*IysAS6ARQVTG#-JU1Mf{t;Ad
zQ2gb{Hp_=jBY>P7?3_x#t|;JM)mbm}qRVFS+_3La3;LG-!!=N;4Wl<1sjPuidS@`N
zp6Wwf^q=~jrV#7iqLvst#hR?fESC2nfFYM_7fU&Jp2@`<_&e&M(3$WF0^tEbfsrbA
zS;=C2DtG^Bv)tD3X$QkpE9S3^gtCF#B@HqAuXL~Q1COO+$)DmMua4~ptlQeVeU5!o
zgUZNvJsq`);+P!myQf7pE96e0;HOv_39k;(ysEy%4shXxAAynHh;vNgK2-Ju+Pjc@
zwQu?BA^u<9Y`f)p9y;XT=6rc`a2ikmjd8iQEnThPd)K#mpVE7IG>392H%f|-`G8b?
z2T@fYTm{Tm{m(Grz*@X@7sg-*?bV^`N~q^xqd0)UK2`A0K#gmD57g<Ir9tz&pm)93
zRlS1HTngyykA@6jT52>ce~e=A4eYoVr{uID1BIu}DHzK4Euve!5Ni4uf$nPK`5uX)
zS#8pF@W|d;V=e>iuv(_5bsUp0_H3V~Jmk$pigw*8Tmyg6^ITWHNGq3$V`t<``g%fQ
z+`EZJ7BfL__ZOuS|IzrvT*>LF)rl^)Pswo<GYdg$yuc^Fpj=Wa7b)kZPk{t?XUcht
z^Xa<CsD^vxkD%X#!*0g)p6}GWfNH&5hJcz`bewaqrJ)!OYns}i*3f1mDQrvZ%+V%q
zpLVc$UAC4|{5j+O?Q{rtu7tWlOpXZGGdh4%)Vi2_Y)8hpR9oP@v3PAtL3)>$SI_H_
z?Ng93l+6_aJ;ZlS(J%Kx6KJBoA;XVaogi<7mj`LZ|3y6>D^x67Es%qnaeU|H)$l7?
zLjDA-KTznZ8sI3QetKl^c&DZsN?oap8}M^dI*BioXPm50VFkE?i*DXgNy;Cvcb~SO
z7cD6bE@8`~!A9Nh3-v}^A)MeJR!cOj<Hs3Jj=m@t^lU3vxqDXA8>&E~HT<?>;Up?o
z;zMbKyg3U&?A6~RFCMt&>rp>Ld(-9y)wsSrgkC~BJ9MjU&wEgh3)Oh<S)&ir$v-&*
zdN{NnCJ;W{0(k5Q#g|RtoMvqnmYe2Qd+hx$EroJ@iZ$fLb=kkFHD+(vLy%h*|5ST7
zxEmL8+w|_a@S<@$q6Ulv9+d(&zX(o#a9zU;{<2PyPns$3*<j<Rr#b6AV_y?=qCBMn
zj-@4>SfBn!c5c3RIJk2J8-7Z#N0>jgKqEbtIqPk{YcfgPj;}{N(nUUcCmigGkRh~}
zZnJOdrX6!}_m4GtbyD@hJ12C~fMlZU6@%v-?!(iOKH0*_Cgpn6Eoj?ZE}MC@+!eC!
zKrF=yzR=jLSvw&}_rz6Pxefxk+c?&SIZTrr0BAopL{K8l%d7e^^ZWN~W$T_^4gHAc
zlV;Yn+$|Z`{sT%b2msErof%3N&ig?*m{fVl+Ze$AgyZ$n?>qMoIH!Km+WY6Z44EDj
zO4zz2v&M7i*?H4yJ&1iL{60%RYqd1aD29;`%_b0ktlBF;j1cr4W=3ij`yePMQWd6m
zj2Orb`JIbo(2OREdwHZeLW4Sq{sgzu;P*`1k92;3sRpV7Y%V=v^hh`?$f4|Xg}$dY
zGu%Na1C|5JOi7oN%8<6|RcrOZ*q|sg(%>?*@gjm{lL(%n0`Ct3{`kVLfrsD#GwSU1
zf61ZefyYm+mZ)r_ZPnQkhH6tdGYNGwsvoq?8L`)NJM<n0s+b)5GGsvFLpxeMg`#9q
z9*bW6l6x0C_C;VJZZqSIXzp0mkJbpNcfdR+A;JQwG|rBTIlWhje5<fhwu`0PuUpCE
z#5yM4+WS@}H#{&=d;R>vw6S;Hy;?EweO~`LmCd^Z#=a>}#P~OJHY`C}Q2SR5g%)dD
zIoNkk764y_{A*ETmetvUz)5beHur+_fUW+()CaZi;8`{3MSV;&Oi#aT{Y=|1h1Xq0
zK8E5Tr|4oCnoXHUc`KH6NGFJYdY&XSZ0E2;dHx$nM`nloPfMMljRdQ+n$APFdQ}n9
zw(q-h^tE0MivN)~CN_gk3Hw*O1+=YkZuW%fwbhjSFU4}etVc=C-|lc-nSMO<?jI|9
z%`lL^Z<eVbx-rP>zM*8;mF`~?%k|qo&EBB{L2pU*Erah-L)i(_pz|*2kg}{ugP|#~
z01J>n$UQ{%RJTm$tQJ^69h~w;+)3FLJS@ti1memkB4{EL`M(k_Sx2f9Ha?qyn=;!w
z6eanx%BRK+wtWe=w-FtWRR;pE5rRbNlmR-FcQ3J!--aN9v)TcOMCLW8mBTvU(cVgB
zC;?HdREzsI;_TI;;q!hvi=xBJ&^8wYzPPRmC|fk7`u<~)4Nme-^JvP8-@wL_|J$3d
zwV=(gD{8<B-fG00_|>dv=*0_ezhJ#X<{S!(g9|DU*M$c6xx5hojAVSWbxLjf*F@;>
zwI4Y#VECy3M-kbEF}#=t`_t>SSP-0MyfF=pFc%#@IoYF4y_&fkMp&y0c618TkN-Ar
z%&pjp5*?PBG}ESPW-fC98dI!1V>JqSae3pXzeo3OGL7(_xcPVO@r5fr0rsLe_k)Ia
zsN9btA^KF7%>^+aRk3{i8kj|;C))#<3%4K2mvJ{-(4(r#jw=w>rg16+uiIS5yDjmV
zWI_70q4N)PWyzKTJcC3cgpDckT)MJu{x|t<8VIshS0B>3&mNgVzg_$?ufi2^#Zx7Y
z5^P^r8b-|t@rPp&$dvMQim)p}UqGj@aP0b{mf%MMmgXkTwPoKEI-a~2@7}=T<xeu<
zCN`}MiQ*?0isf3mT@fp@fj3I!5{);~C@Px^QOE+(x<_AQw-x(&neb`lHknlg9rc{4
zo-6mnrGTg<7Fdf!y}%`?TkYE82a_5FdnxMT|824nbwmx;HiD#yOh=lEj6ubR9E-|U
z8>)cL@NjL?D+HtxDpudRc%Gmkfpgz%m|uk={W^1J`@E)DJ<e;-^x4NQ5Rh1r55qfy
zhVsTu)^^@ZmvcubDd;M_nu%Qtyj4i!g?l<mvBn$Ol*ABi;p*0UeXQ2#CFv7YDYvh6
zCElyb^hduMOu6+&ojamPS$0;O3lCEa!>EFD-;u!z(cuUOlk!&&Ml=axpx(h2KlpO%
zy@JqJDoKzzBT`qD@nwR~#pE<S-}K|hu)*ZPv4L#hp=snJ6Yo{%51zL|sC}YIdCp|g
z?r+!Anaj$++NDGmC+yJnfiJk<8a8=)PuiC$vr-6Xn=S=3sf>3JE0clZfaOcqJ=Dl-
z;eBNOHcq}Q&`TxI%!MIyIqHA9Cps*A?Zod;&Tog&NyR^2SdBgEplW`H9kf{tJnBdz
zp)O~p1>QTsFd=bpnr#$u3bmSz`U<k{YJ#NRPtfL&Updf5@LL`z{f4tewEX%Ah;xHL
zp~}*qN*({r1(h8Ng)NU6`17Yj`iXSvsZMu{VaEHw4S|&x!ukZxoyGt{-oRA$90{D6
zxz`7BbK7bMRQx^0)D$uY)fkupzq(LFPN8S;Pv};?d%~6Wem(bU?p2^|s_#naR{jmN
z7!&>>K8(BUFG(?3ndp$)af3PsZa9Kn-E>{<1pRmmd#rT5&xm26q(#TO)1A{eA0k=#
z!(-a!ea#n(WMTgI9kiN466PFZ0qsu?%{_@$ztv_bI2?Ep+bm{A4L}8ME`*>0(Qh)F
h#acs6>t7$xP(oI&daNTR!EfY4V0vb{)!Mfn{2v6oN)Z46

diff --git a/windows/manage/index.md b/windows/manage/index.md
index f402ad0f0e..36df08a4b0 100644
--- a/windows/manage/index.md
+++ b/windows/manage/index.md
@@ -1,7 +1,6 @@
 ---
 title: Manage and update Windows 10 (Windows 10)
 description: Learn about managing and updating Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: E5716355-02AB-4B75-A962-14B1A7F7BDA0
 keywords: ["Windows 10", "MDM", "WSUS", "Windows update"]
 ms.prod: W10
@@ -75,6 +74,11 @@ Learn about managing and updating Windows 10.
 
  
 
+## Related topics
+
+
+[Windows 10 and Windows 10 Mobile](../index.md)
+
  
 
  
diff --git a/windows/manage/introduction-to-windows-10-servicing.md b/windows/manage/introduction-to-windows-10-servicing.md
index 3e1d6e3ee0..e6837458dd 100644
--- a/windows/manage/introduction-to-windows-10-servicing.md
+++ b/windows/manage/introduction-to-windows-10-servicing.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 servicing options for updates and upgrades (Windows 10)
-description: This article describes the new servicing options available in Windows 10 Windows 10 Mobile and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades.
-MSHAttr: PreferredLib /library
+description: This article describes the new servicing options available in Windows 10, Windows 10 Mobile, and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades.
 ms.assetid: D1DEB7C0-283F-4D7F-9A11-EE16CB242B42
 keywords: ["update", "LTSB", "lifecycle", "Windows update", "upgrade"]
 ms.prod: W10
@@ -19,16 +18,6 @@ author: jdeckerMS
 -   Windows 10 Mobile
 -   Windows 10 IoT Core (IoT Core)
 
-**In this article**
-
--   [Introduction](#introduction)
--   [Streamlined product development and release cycles](#streamlined-product-development-and-release-cycles)
--   [New Windows 10 delivery and installation alternatives](#new-windows-10-delivery-and-installation-alternatives)
--   [Windows 10 servicing options](#windows-10-servicing-options)
--   [Plan for Windows 10 deployment](#plan-for-windows-10-deployment)
--   [Servicing options and servicing branch designations](#servicing-options-and-servicing-branch-designations)
--   [Related topics](#related-topics)
-
 This article describes the new servicing options available in Windows 10, Windows 10 Mobile, and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles.
 
 **Note**  
diff --git a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md b/windows/manage/join-windows-10-mobile-to-azure-active-directory.md
index 45a4541294..0002b2917d 100644
--- a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md
+++ b/windows/manage/join-windows-10-mobile-to-azure-active-directory.md
@@ -1,7 +1,6 @@
 ---
 title: Join Windows 10 Mobile to Azure Active Directory (Windows 10)
-description: Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out of box experience (OOBE).
-MSHAttr: PreferredLib /library
+description: Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE).
 ms.assetid: 955DD9EC-3519-4752-827E-79CEB1EC8D6B
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -16,17 +15,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Why join Windows 10 Mobile to Azure AD](#why-join-windows-10-mobile-to-azure-ad)
--   [Are you upgrading current devices to Windows 10 Mobile?](#bkmk-upgrade)
--   [The difference between "Add work account" and "Azure AD Join"](#add-work-account)
--   [Preparing for Windows 10 Mobile](#preparing-for-windows-10-mobile)
--   [How to join Windows 10 Mobile to Azure AD](#how-to-join-windows-10-mobile-to-azure-ad)
--   [Set up mail and calendar](#set-up-mail-and-calendar)
--   [Use Office and OneDrive apps](#use-office-and-onedrive-apps)
--   [Use Windows Store for Business](#use-windows-store-for-business)
-
 Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE). This article describes the considerations and options for using Windows 10 Mobile with Azure AD in your organization.
 
 ## Why join Windows 10 Mobile to Azure AD
@@ -42,7 +30,7 @@ When a device running Windows 10 Mobile is joined to Azure AD, the device can e
 
 -   Automatically enroll in your mobile device management (MDM) service.
 
--   Enable enterprise roaming of settings.
+-   Enable enterprise roaming of settings. (Not currently supported but on roadmap)
 
 -   Use Windows Store for Business to target applications to users.
 
@@ -68,7 +56,7 @@ Even though Azure AD Join on Windows 10 Mobile provides the best overall experi
 
 -   You can add access to Azure AD-backed resources on the device without resetting the device.
 
-However, neither of these methods provides SSO in the Windows Store and does not provide the ability to roam settings based on the Azure AD account using enterprise roaming. [Learn about enterprise state roaming in Azure AD.](http://go.microsoft.com/fwlink/p/?LinkId=734996)
+However, neither of these methods provides SSO in the Windows Store or SSO to resources on-premises, and does not provide the ability to roam settings based on the Azure AD account using enterprise roaming. [Learn about enterprise state roaming in Azure AD.](http://go.microsoft.com/fwlink/p/?LinkId=734996)
 
 Using **Settings** &gt; **Accounts** &gt; **Your email and accounts** &gt; **Add work or school account**, users can add their Azure AD account to the device. Alternatively, a work account can be added when the user signs in to an application like Mail, Word, etc. If you [enable auto-enrollment in your MDM settings](http://go.microsoft.com/fwlink/p/?LinkID=691615), the device will automatically be enrolled in MDM.
 
@@ -89,7 +77,7 @@ An added work account provides the same SSO experience in browser apps like Offi
 
 -   **Mobile device management**
 
-    An MDM service is required for managing Azure AD-joined devices. You can use MDM to push settings to devices, as well as application and certificates used by VPN, Wi-Fi, etc. Azure AD Premium or EDP licenses are required to set up your Azure AD-joined devices to automatically enroll in MDM. [Learn more about setting up your Azure AD tenant for MDM auto-enrollment.](http://go.microsoft.com/fwlink/p/?LinkID=691615)
+    An MDM service is required for managing Azure AD-joined devices. You can use MDM to push settings to devices, as well as application and certificates used by VPN, Wi-Fi, etc. Azure AD Premium or Enterprise Mobility Services (EMS) licenses are required to set up your Azure AD-joined devices to automatically enroll in MDM. [Learn more about setting up your Azure AD tenant for MDM auto-enrollment.](http://go.microsoft.com/fwlink/p/?LinkID=691615)
 
 -   **Microsoft Passport**
 
diff --git a/windows/manage/lock-down-windows-10-to-specific-apps.md b/windows/manage/lock-down-windows-10-to-specific-apps.md
index 6df077fa2b..4379103252 100644
--- a/windows/manage/lock-down-windows-10-to-specific-apps.md
+++ b/windows/manage/lock-down-windows-10-to-specific-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Lock down Windows 10 to specific apps (Windows 10)
 description: Learn how to configure a device running Windows 10 Enterprise or Windows 10 Education so that users can only run a few specific apps.
-MSHAttr: PreferredLib /library
 ms.assetid: 14DDDC96-88C7-4181-8415-B371F25726C8
 keywords: ["lockdown", "app restrictions", "applocker"]
 ms.prod: W10
@@ -17,13 +16,6 @@ author: jdeckerMS
 
 -   Windows 10
 
-**In this article**
-
--   [Install apps](#install-apps)
--   [Use AppLocker to set rules for apps](#use-applocker-to-set-rules-for-apps)
--   [Other settings to lock down](#other-settings-to-lock-down)
--   [Customize Start screen layout for the device](#customize-start-screen-layout-for-the-device)
-
 Learn how to configure a device running Windows 10 Enterprise or Windows 10 Education so that users can only run a few specific apps. The result is similar to [a kiosk device](set-up-a-device-for-anyone-to-use.md), but with multiple apps available. For example, you might set up a library computer so that users can search the catalog and browse the Internet, but can't run any other apps or change computer settings.
 
 You can restrict users to a specific set of apps on a device running Windows 10 Enterprise or Windows 10 Education by using [AppLocker](../keep-secure/applocker-overview-server.md). AppLocker rules specify which apps are allowed to run on the device.
diff --git a/windows/manage/lock-down-windows-10.md b/windows/manage/lock-down-windows-10.md
index 8bd6ca744c..f411de7cdb 100644
--- a/windows/manage/lock-down-windows-10.md
+++ b/windows/manage/lock-down-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Lock down Windows 10 (Windows 10)
 description: Enterprises often need to manage how people use corporate devices. Windows 10 provides a number of features and methods to help you lock down specific parts of a Windows 10 device.
-MSHAttr: PreferredLib /library
 ms.assetid: 955BCD92-0A1A-4C48-98A8-30D7FAF2067D
 keywords: ["lockdown"]
 ms.prod: W10
@@ -45,10 +44,10 @@ Enterprises often need to manage how people use corporate devices. Windows 10 p
 </tr>
 <tr class="odd">
 <td align="left"><p>[Configure telemetry in your organization](configure-telemetry-in-your-organization.md)</p></td>
-<td align="left"><p>Use this article to make informed decisions about how you can configure telemetry in your organization. We discuss telemetry as system data that is uploaded by the Connected User Experience and Telemetry component.</p></td>
+<td align="left"><p>Use this article to make informed decisions about how you can configure telemetry in your organization. Telemetry is a term that means different things to different people and organizations. For the purpose of this article, we discuss telemetry as system data that is uploaded by the Connected User Experience and Telemetry component. The telemetry data is used to keep Windows devices secure, and to help Microsoft improve the quality of Windows and Microsoft services.</p></td>
 </tr>
 <tr class="even">
-<td align="left"><p>[Disconnect from Microsoft and configure privacy settings in your organization](manage-privacy-for-windows-10-in-your-company.md)</p></td>
+<td align="left"><p>[Disconnect from Microsoft and configure privacy settings in your organization](disconnect-your-organization-from-microsoft.md)</p></td>
 <td align="left"><p>If you want to minimize connections from Windows to Microsoft services, or configure particular privacy settings, this article covers the settings that you could consider.</p>
 <p>If you’re looking for content on what each telemetry level means and how to configure it in your organization, see [Configure telemetry in your organization](configure-telemetry-in-your-organization.md).</p></td>
 </tr>
@@ -77,7 +76,7 @@ Enterprises often need to manage how people use corporate devices. Windows 10 p
 ## Related topics
 
 
-[Lockdown features from Windows Embedded Industry 8.1](../whats-new/lockdown-features-from-windows-embedded-industry-8-1.md)
+[Lockdown features from Windows Embedded Industry 8.1](../whats-new/lockdown-features-windows-10.md)
 
  
 
diff --git a/windows/manage/lockdown-xml.md b/windows/manage/lockdown-xml.md
index 447717d8f2..2c7a2b68d6 100644
--- a/windows/manage/lockdown-xml.md
+++ b/windows/manage/lockdown-xml.md
@@ -1,7 +1,6 @@
 ---
 title: Configure Windows 10 Mobile using Lockdown XML (Windows 10)
-description: Windows 10 Mobile allows enterprises to lock down a device define multiple user roles and configure custom layouts on a device.
-MSHAttr: PreferredLib /library
+description: Windows 10 Mobile allows enterprises to lock down a device, define multiple user roles, and configure custom layouts on a device.
 ms.assetid: 22C8F654-2EC3-4E6D-8666-1EA9FCF90F5F
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -16,15 +15,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Order of lockdown settings](#order-of-lockdown-settings)
--   [Configuring multiple app packages](#bmk-map)
--   [Lockdown example to use in a lockdown XML file](#lockdown-example-to-use-in-a-lockdown-xml-file)
--   [Add lockdown XML to a provisioning package](#add-lockdown-xml-to-a-provisioning-package)
--   [Push lockdown XML using MDM](#push-lockdown-xml-using-mdm)
--   [Related topics](#related-topics)
-
 Windows 10 Mobile allows enterprises to lock down a device, define multiple user roles, and configure custom layouts on a device. For example, the enterprise can lock down a device so that only applications and settings in an allow list are available.
 
 This topic provides example XML that you can use in your own lockdown XML file that can be included in a provisioning package or when using a mobile device management (MDM) solution to push lockdown settings to enrolled devices.
diff --git a/windows/manage/manage-access-to-private-store.md b/windows/manage/manage-access-to-private-store.md
index 7e08503c6d..09664ba97f 100644
--- a/windows/manage/manage-access-to-private-store.md
+++ b/windows/manage/manage-access-to-private-store.md
@@ -1,7 +1,6 @@
 ---
 title: Manage access to private store (Windows 10)
 description: You can manage access to your private store in Windows Store for Business.
-MSHAttr: PreferredLib /library
 ms.assetid: 4E00109C-2782-474D-98C0-02A05BE613A5
 author: jdeckerMS
 ---
diff --git a/windows/manage/manage-apps.md b/windows/manage/manage-apps.md
index 1a1c384f29..0d661cb50a 100644
--- a/windows/manage/manage-apps.md
+++ b/windows/manage/manage-apps.md
@@ -1,7 +1,6 @@
 ---
 title: Manage apps in Windows Store for Business (Windows 10)
 description: Manage settings and access to apps in Windows Store for Business.
-MSHAttr: PreferredLib /library
 ms.assetid: 2F65D4C3-B02C-41CC-92F0-5D9937228202
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/manage-corporate-devices.md b/windows/manage/manage-corporate-devices.md
index 8122051ef7..af0555339b 100644
--- a/windows/manage/manage-corporate-devices.md
+++ b/windows/manage/manage-corporate-devices.md
@@ -1,7 +1,6 @@
 ---
 title: Manage corporate devices (Windows 10)
-description: You can use the same management tools to manage all device types running Windows 10 desktops laptops tablets and phones.
-MSHAttr: PreferredLib /library
+description: You can use the same management tools to manage all device types running Windows 10 desktops, laptops, tablets, and phones.
 ms.assetid: 62D6710C-E59C-4077-9C7E-CE0A92DFC05D
 keywords: ["MDM", "device management"]
 ms.prod: W10
@@ -18,14 +17,6 @@ author: jdeckerMS
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Identity and management options](#identity-and-management-options)
--   [How setting conflicts are resolved](#how-setting-conflicts-are-resolved)
--   [MDM enrollment](#mdm-enrollment)
--   [Learn more](#learn-more)
--   [Related topics](#related-topics)
-
 You can use the same management tools to manage all device types running Windows 10 : desktops, laptops, tablets, and phones. And your current management tools, such as Group Policy, Windows Management Instrumentation (WMI), Windows PowerShell scripts, Orchestrator runbooks, System Center tools, and so on, will continue to work for Windows 10 on desktop editions.
 
 There are several options for managing Windows 10 on corporate-owned devices in an enterprise.
diff --git a/windows/manage/manage-cortana-in-your-enterprise.md b/windows/manage/manage-cortana-in-your-enterprise.md
index e9bc075bc3..ef6400a064 100644
--- a/windows/manage/manage-cortana-in-your-enterprise.md
+++ b/windows/manage/manage-cortana-in-your-enterprise.md
@@ -1,7 +1,6 @@
 ---
 title: Cortana integration in your business or enterprise (Windows 10)
-description: The world’s first personal digital assistant helps users get things done even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium sized business and enterprise environments.
-MSHAttr: PreferredLib /library
+description: The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
 ms.assetid: DB7B05DA-186F-4628-806A-F8B134E2AF2C
 author: jdeckerMS
 ---
@@ -29,6 +28,33 @@ But Cortana works even harder when she connects to Office 365, helping employees
 
 -   For a quick review of the frequently asked questions about Cortana and Office 365 integration, see the blog post, [An early look at Cortana integration with Office 365](http://go.microsoft.com/fwlink/p/?LinkId=717379).
 
+## <a href="" id="cortana-and-bi-power"></a>Cortana and Power BI
+
+
+Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana answers using the full capabilities of Power BI Desktop.
+
+**More info:**
+
+-   For specific info about how to start using Power BI and Cortana integration, how to customize your data results, and how to use the “Hey Cortana” functionality, see the [Power BI: Announcing Power BI integration with Cortana and new ways to quickly find insights in your data](http://go.microsoft.com/fwlink/p/?LinkId=717382) blog.
+
+## Cortana and Microsoft Dynamics CRM
+
+
+Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time.
+
+**More info:**
+
+-   For more info about Preview features, see [What are Preview features and how do I enable them?](http://go.microsoft.com/fwlink/p/?LinkId=746817).
+
+-   For more info about Cortana, see [What is Cortana?](http://go.microsoft.com/fwlink/p/?LinkId=746818).
+
+-   For more info about CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](http://go.microsoft.com/fwlink/?LinkId=746819).
+
+## Cortana and privacy
+
+
+We understand that there are concerns about Cortana and enterprise privacy, so we’ve put together the [Cortana, Search, and privacy: FAQ](http://go.microsoft.com/fwlink/p/?LinkId=717383) topic that covers many of the frequently asked questions. These questions include things such as what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services.
+
 ## <a href="" id="set-up-cortana-using-gp-and-mdm"></a>Set up Cortana using Group Policy and MDM policies
 
 
@@ -126,30 +152,6 @@ Set up and manage Cortana by using the following Group Policy and mobile device
 </div></td>
 </tr>
 <tr class="even">
-<td align="left"><p>User Configuration\Administrative Templates\Start Menu and Taskbar\Do not search for files</p></td>
-<td align="left"><p>None</p></td>
-<td align="left"><p>Specifies whether the Start menu search box searches for files.</p>
-<div class="alert">
-<strong>Important</strong>  
-<p>Cortana won’t work if this setting is turned off (disabled).</p>
-</div>
-<div>
- 
-</div></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>User Configuration\Administrative Templates\Start Menu and Taskbar\Do not search programs and Control Panel items</p></td>
-<td align="left"><p>None</p></td>
-<td align="left"><p>Specifies whether the Start menu search box searches for programs or Control Panel items.</p>
-<div class="alert">
-<strong>Important</strong>  
-<p>Cortana won’t work if this setting is turned off (disabled).</p>
-</div>
-<div>
- 
-</div></td>
-</tr>
-<tr class="even">
 <td align="left"><p>User Configuration\Administrative Templates\Start Menu and Taskbar\Do not search communications</p></td>
 <td align="left"><p>None</p></td>
 <td align="left"><p>Specifies whether the Start menu search box searches communications.</p>
@@ -170,33 +172,6 @@ Set up and manage Cortana by using the following Group Policy and mobile device
 
 -   For specific info about how to set, manage, and use each of these MDM policies to configure Cortana in your enterprise, see the [Policy CSP](http://go.microsoft.com/fwlink/p/?LinkId=717380) topic, located in the configuration service provider reference topics. For specific info about how to set, manage, and use each of these Group Policies to configure Cortana in your enterprise, see the [Group Policy TechCenter](http://go.microsoft.com/fwlink/p/?LinkId=717381).
 
-## <a href="" id="cortana-and-bi-power"></a>Cortana and Power BI
-
-
-Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana answers using the full capabilities of Power BI Desktop.
-
-**More info:**
-
--   For specific info about how to start using Power BI and Cortana integration, how to customize your data results, and how to use the “Hey Cortana” functionality, see the [Power BI: Announcing Power BI integration with Cortana and new ways to quickly find insights in your data](http://go.microsoft.com/fwlink/p/?LinkId=717382) blog.
-
-## Cortana and Microsoft Dynamics CRM
-
-
-Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant info at any given time.
-
-**More info:**
-
--   For more info about Preview features, see [What are Preview features and how do I enable them?](http://go.microsoft.com/fwlink/p/?LinkId=746817).
-
--   For more info about Cortana, see [What is Cortana?](http://go.microsoft.com/fwlink/p/?LinkId=746818).
-
--   For more info about CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](http://go.microsoft.com/fwlink/?LinkId=746819).
-
-## Cortana and privacy
-
-
-We understand that there are concerns about Cortana and enterprise privacy, so we’ve put together the [Cortana, Search, and privacy: FAQ](http://go.microsoft.com/fwlink/p/?LinkId=717383) topic that covers many of the frequently asked questions. These questions include things such as what info is collected by Cortana, where the info is saved, how to manage what data is collected, how to turn Cortana off, how to opt completely out of data collection, and what info is shared with other Microsoft apps and services.
-
 ## Related topics
 
 
diff --git a/windows/manage/manage-private-store-settings.md b/windows/manage/manage-private-store-settings.md
index 47a0abe21a..6b52a382f2 100644
--- a/windows/manage/manage-private-store-settings.md
+++ b/windows/manage/manage-private-store-settings.md
@@ -1,7 +1,6 @@
 ---
 title: Manage private store settings (Windows 10)
 description: The private store is a feature in the Windows Store for Business that organizations receive during the sign up process.
-MSHAttr: PreferredLib /library
 ms.assetid: 2D501538-0C6E-4408-948A-2BF5B05F7A0C
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/manage-settings-in-the-windows-store-for-business.md b/windows/manage/manage-settings-in-the-windows-store-for-business.md
index 1c57ca86d1..9a61f80f15 100644
--- a/windows/manage/manage-settings-in-the-windows-store-for-business.md
+++ b/windows/manage/manage-settings-in-the-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Manage settings for the Windows Store for Business (Windows 10)
-description: You can add users and groups as well as update some of the settings associated with the Azure Active Directory (AD) tenant.
-MSHAttr: PreferredLib /library
+description: You can add users and groups, as well as update some of the settings associated with the Azure Active Directory (AD) tenant.
 ms.assetid: E3283D77-4DB2-40A9-9479-DDBC33D5A895
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/manage-users-and-groups-in-the-windows-store-for-business.md b/windows/manage/manage-users-and-groups-in-the-windows-store-for-business.md
index c51450d7d9..d34ca092f9 100644
--- a/windows/manage/manage-users-and-groups-in-the-windows-store-for-business.md
+++ b/windows/manage/manage-users-and-groups-in-the-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Manage user accounts in Windows Store for Business (Windows 10)
-description: Windows Store for Business manages permissions with a set of roles. Currently you can assign these roles to individuals in your organization but not to groups.
-MSHAttr: PreferredLib /library
+description: Windows Store for Business manages permissions with a set of roles. Currently, you can assign these roles to individuals in your organization, but not to groups.
 ms.assetid: 5E7FA071-CABD-4ACA-8AAE-F549EFCE922F
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/manage-wi-fi-sense-in-your-company.md b/windows/manage/manage-wi-fi-sense-in-your-company.md
index 6b758fd830..86ec3de588 100644
--- a/windows/manage/manage-wi-fi-sense-in-your-company.md
+++ b/windows/manage/manage-wi-fi-sense-in-your-company.md
@@ -1,7 +1,6 @@
 ---
-title: Manage Wi Fi Sense in your company (Windows 10)
-description: Wi Fi Sense automatically connects you to Wi Fi so you can get online quickly in more places.
-MSHAttr: PreferredLib /library
+title: Manage Wi-Fi Sense in your company (Windows 10)
+description: Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places.
 ms.assetid: 1845E00D-C4EE-4A8F-A5E5-D00F2735A271
 keywords: ["WiFi Sense", "Shared networks"]
 ms.prod: W10
diff --git a/windows/manage/new-policies-for-windows-10.md b/windows/manage/new-policies-for-windows-10.md
index ec537e764a..7bc7dd8224 100644
--- a/windows/manage/new-policies-for-windows-10.md
+++ b/windows/manage/new-policies-for-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: New policies for Windows 10 (Windows 10)
-description: Windows 10 includes the following new policies for management in addition to policies that were available for Windows 8.1 and Windows Phone 8.1.
-MSHAttr: PreferredLib /library
+description: Windows 10 includes the following new policies for management, in addition to policies that were available for Windows 8.1 and Windows Phone 8.1.
 ms.assetid: 1F24ABD8-A57A-45EA-BA54-2DA2238C573D
 keywords: ["MDM", "Group Policy"]
 ms.prod: W10
diff --git a/windows/manage/placeholder.md b/windows/manage/placeholder.md
deleted file mode 100644
index 05ef632ece..0000000000
--- a/windows/manage/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-#Placeholder content
\ No newline at end of file
diff --git a/windows/manage/prerequisites-for-windows-store-for-business.md b/windows/manage/prerequisites-for-windows-store-for-business.md
index 19bffe754f..7a13825ca7 100644
--- a/windows/manage/prerequisites-for-windows-store-for-business.md
+++ b/windows/manage/prerequisites-for-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Prerequisites for Windows Store for Business (Windows 10)
 description: There are a few prerequisites for using Windows Store for Business.
-MSHAttr: PreferredLib /library
 ms.assetid: CEBC6870-FFDD-48AD-8650-8B0DC6B2651D
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/product-ids-in-windows-10-mobile.md b/windows/manage/product-ids-in-windows-10-mobile.md
index 06499ffe35..f1d0dbe396 100644
--- a/windows/manage/product-ids-in-windows-10-mobile.md
+++ b/windows/manage/product-ids-in-windows-10-mobile.md
@@ -1,7 +1,6 @@
 ---
 title: Product IDs in Windows 10 Mobile (Windows 10)
 description: You can use the product ID and Application User Model (AUMID) in Lockdown.xml to specify apps that will be available to the user.
-MSHAttr: PreferredLib /library
 ms.assetid: 31116BED-C16A-495A-BD44-93218A087A1C
 keywords: ["lockdown"]
 ms.prod: W10
@@ -17,12 +16,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Apps included in Windows 10 Mobile](#apps-included-in-windows-10-mobile)
--   [Get product ID and AUMID for other apps](#get-product-id-and-aumid-for-other-apps)
--   [Related topics](#related-topics)
-
 You can use the product ID and Application User Model (AUMID) in Lockdown.xml to specify apps that will be available to the user.
 
 ## Apps included in Windows 10 Mobile
diff --git a/windows/manage/reset-a-windows-10-mobile-device.md b/windows/manage/reset-a-windows-10-mobile-device.md
index fc68025b98..cef13c549f 100644
--- a/windows/manage/reset-a-windows-10-mobile-device.md
+++ b/windows/manage/reset-a-windows-10-mobile-device.md
@@ -1,7 +1,6 @@
 ---
 title: Reset a Windows 10 Mobile device (Windows 10)
 description: There are two methods for resetting a Windows 10 Mobile device factory reset and \ 0034;wipe and persist \ 0034; reset.
-MSHAttr: PreferredLib /library
 ms.assetid: B42A71F4-DFEE-4D6E-A904-7942D1AAB73F
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -16,12 +15,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Reset using MDM](#reset-using-mdm)
--   [Reset using the UI](#-reset-using-the-ui)
--   [Reset using hardware buttons](#reset-using-hardware-buttons)
-
 There are two methods for resetting a Windows 10 Mobile device: factory reset and "wipe and persist" reset.
 
 -   **Factory reset** restores the state of the device back to its first-boot state plus any update packages. The reset will not return device to the original factory state. To return the device to the original factory state, you must flash it with the original factory image.All the provisioning applied to the device by the enterprise will be lost and will need to be re-applied if needed. For details on what is removed or persists, see [Resetting a mobile device](http://go.microsoft.com/fwlink/p/?LinkID=703715).
diff --git a/windows/manage/roles-and-permissions-in-the-windows-store-for-business.md b/windows/manage/roles-and-permissions-in-the-windows-store-for-business.md
index 6cef2a804a..f776407a57 100644
--- a/windows/manage/roles-and-permissions-in-the-windows-store-for-business.md
+++ b/windows/manage/roles-and-permissions-in-the-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Roles and permissions in Windows Store for Business (Windows 10)
-description: The first person to sign in to Windows Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in they can give permissions to others employees.
-MSHAttr: PreferredLib /library
+description: The first person to sign in to Windows Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.
 ms.assetid: CB6281E1-37B1-4B8B-991D-BC5ED361F1EE
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/set-up-a-device-for-anyone-to-use.md b/windows/manage/set-up-a-device-for-anyone-to-use.md
index 6acaf91471..9c70e0cbf2 100644
--- a/windows/manage/set-up-a-device-for-anyone-to-use.md
+++ b/windows/manage/set-up-a-device-for-anyone-to-use.md
@@ -1,7 +1,6 @@
 ---
 title: Set up a device for anyone to use (kiosk mode) (Windows 10)
-description: You can configure a device running Windows 10 Pro Windows 10 Enterprise Windows 10 Education Windows 10 Mobile or Windows 10 Mobile Enterprise as a kiosk device so that users can only interact with a single application that you select.
-MSHAttr: PreferredLib /library
+description: You can configure a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise as a kiosk device, so that users can only interact with a single application that you select.
 ms.assetid: F1F4FF19-188C-4CDC-AABA-977639C53CA8
 keywords: ["kiosk", "lockdown", "assigned access"]
 ms.prod: W10
diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
index 730183f00c..79d871504a 100644
--- a/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
+++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
@@ -1,7 +1,6 @@
 ---
-title: Set up a kiosk on Windows 10 Pro Enterprise or Education (Windows 10)
-description: A single use device is easy to set up in Windows 10 for desktop editions (Pro Enterprise and Education).
-MSHAttr: PreferredLib /library
+title: Set up a kiosk on Windows 10 Pro, Enterprise, or Education (Windows 10)
+description: A single-use device is easy to set up in Windows 10 for desktop editions (Pro, Enterprise, and Education).
 ms.assetid: 428680AE-A05F-43ED-BD59-088024D1BFCC
 keywords: ["assigned access", "kiosk", "lockdown"]
 ms.prod: W10
@@ -21,13 +20,6 @@ author: jdeckerMS
 
 -   [Assigned Access]( http://go.microsoft.com/fwlink/p/?LinkId=613653)
 
-**In this article**
-
--   [Other settings to lock down](#other-settings-to-lock-down)
--   [Assigned access method for Universal Windows apps](#assigned-access-method)
--   [Shell Launcher for Classic Windows applications](#local-user-policy)
--   [Related topics](#related-topics)
-
 A single-use device is easy to set up in Windows 10 for desktop editions (Pro, Enterprise, and Education). For a kiosk device to run a Universal Windows app, use the **assigned access** feature. For a kiosk device (Windows 10 Enterprise or Education) to run a Classic Windows application, use **Shell Launcher** to set a custom user interface as the shell. To return the device to the regular shell, see [Sign out of assigned access](#sign-out-of-assigned-access).
 
 **Note**  
diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
index eb9983efc1..bc918aae23 100644
--- a/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
+++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
@@ -1,7 +1,6 @@
 ---
 title: Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise (Windows 10)
-description: A device in kiosk mode runs a specified app with no access to other device functions menus or settings.
-MSHAttr: PreferredLib /library
+description: A device in kiosk mode runs a specified app with no access to other device functions, menus, or settings.
 ms.assetid: 35EC82D8-D9E8-45C3-84E9-B0C8C167BFF7
 keywords: ["kiosk", "lockdown", "assigned access"]
 ms.prod: W10
@@ -17,12 +16,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Apps Corner](#apps-corner)
--   [Enterprise Assigned Access](#enterprise-assigned-access)
--   [Related topics](#related-topics)
-
 A device in kiosk mode runs a specified app with no access to other device functions, menus, or settings. You configure a device running Windows 10 Mobile or Windows 10 Mobile Enterprise for kiosk mode by using the Apps Corner feature. You can also use the Enterprise Assigned Access configuration service provider (CSP) to configure a kiosk experience.
 
 **Note**  
diff --git a/windows/manage/settings-reference--windows-store-for-business.md b/windows/manage/settings-reference--windows-store-for-business.md
index 1447c3d273..e092ef5913 100644
--- a/windows/manage/settings-reference--windows-store-for-business.md
+++ b/windows/manage/settings-reference--windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Settings reference Windows Store for Business (Windows 10)
 description: The Windows Store for Business has a group of settings that admins use to manage the store.
-MSHAttr: PreferredLib /library
 ms.assetid: 34F7FA2B-B848-454B-AC00-ECA49D87B678
 ms.prod: W10
 ms.mktglfcycl: manage
@@ -19,8 +18,9 @@ author: jdeckerMS
 
 The Windows Store for Business has a group of settings that admins use to manage the store.
 
-|  Setting             |  Description                                                                                                                                                                                                                                                                                                                                                                                                      |
-|----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                      |                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Setting              | Description                                                                                                                                                                                                                                                                                                                                                                                                        |
 | Account information  | Provides info on these configured settings for your Store for Business account . These settings include: country or region, default domain, organization name, and language preference. You can make updates to these settings with Office 365 or Azure management portals. For more information, see [Manage settings for the Windows Store for Business](manage-settings-in-the-windows-store-for-business.md). |
 | Device Guard signing | Use the Device Guard signing portal to add unsigned apps to a code integrity policy, or to sign code integrity policies. For more information, see [Device Guard signing portal](device-guard-signing-portal.md).                                                                                                                                                                                                 |
 | LOB publishers       | Invite devs to become LOB publishers for your organization. Existing LOB publishers are listed on the page, and you can deactivate or invite them again. For more information, see [Work with line-of-business apps](working-with-line-of-business-apps.md).                                                                                                                                                      |
diff --git a/windows/manage/settings-that-can-be-locked-down.md b/windows/manage/settings-that-can-be-locked-down.md
index 9abc2ae1e5..dda4084fd0 100644
--- a/windows/manage/settings-that-can-be-locked-down.md
+++ b/windows/manage/settings-that-can-be-locked-down.md
@@ -1,7 +1,6 @@
 ---
 title: Settings and quick actions that can be locked down in Windows 10 Mobile (Windows 10)
 description: This topic lists the settings and quick actions that can be locked down in Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: 69E2F202-D32B-4FAC-A83D-C3051DF02185
 keywords: ["lockdown"]
 ms.prod: W10
diff --git a/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md b/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md
index 0064c4d6dd..68685446d7 100644
--- a/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md
+++ b/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md
@@ -1,7 +1,6 @@
 ---
 title: Sign code integrity policy with Device Guard signing (Windows 10)
 description: Signing code integrity policies prevents policies from being tampered with after they're deployed. You can sign code integrity policies with the Device Guard signing portal.
-MSHAttr: PreferredLib /library
 ms.assetid: 63B56B8B-2A40-44B5-B100-DC50C43D20A9
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/sign-up-and-get-started.md b/windows/manage/sign-up-and-get-started.md
index 6166fd7398..1516f02855 100644
--- a/windows/manage/sign-up-and-get-started.md
+++ b/windows/manage/sign-up-and-get-started.md
@@ -1,7 +1,6 @@
 ---
 title: Sign up and get started (Windows 10)
-description: IT admins can sign up for the Windows Store for Business and get started working with apps.
-MSHAttr: PreferredLib /library
+description: IT admins can sign up for the Windows Store for Business, and get started working with apps.
 ms.assetid: 87C6FA60-3AB9-4152-A85C-6A1588A20C7B
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/sign-up-for-windows-store-for-business.md b/windows/manage/sign-up-for-windows-store-for-business.md
index a1f749576a..0a57c72f72 100644
--- a/windows/manage/sign-up-for-windows-store-for-business.md
+++ b/windows/manage/sign-up-for-windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Sign up for Windows Store for Business (Windows 10)
-description: Before you sign up for Windows Store for Business at a minimum you'll need an Azure Active Directory (AD) account for your organization and you'll need to be the global administrator for your organization.
-MSHAttr: PreferredLib /library
+description: Before you sign up for Windows Store for Business, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization.
 ms.assetid: 296AAC02-5C79-4999-B221-4F5F8CEA1F12
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/stop-employees-from-using-the-windows-store.md b/windows/manage/stop-employees-from-using-the-windows-store.md
index cfe330b3bd..4b3444dec6 100644
--- a/windows/manage/stop-employees-from-using-the-windows-store.md
+++ b/windows/manage/stop-employees-from-using-the-windows-store.md
@@ -1,7 +1,6 @@
 ---
 title: Configure access to Windows Store (Windows 10)
-description: IT Pros can configure access to Windows Store for client computers in their organization. For some organizations business policies require blocking access to Windows Store.
-MSHAttr: PreferredLib /library
+description: IT Pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store.
 ms.assetid: 7AA60D3D-2A69-45E7-AAB0-B8AFC29C2E97
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/troubleshoot.md b/windows/manage/troubleshoot.md
index be13825ba8..645ed563fe 100644
--- a/windows/manage/troubleshoot.md
+++ b/windows/manage/troubleshoot.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshoot Windows Store for Business (Windows 10)
 description: Troubleshooting topics for Windows Store for Business.
-MSHAttr: PreferredLib /library
 ms.assetid: 243755A3-9B20-4032-9A77-2207320A242A
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/update-windows-store-for-business-account-settings-.md b/windows/manage/update-windows-store-for-business-account-settings-.md
index 5e9c5eaed6..289361b794 100644
--- a/windows/manage/update-windows-store-for-business-account-settings-.md
+++ b/windows/manage/update-windows-store-for-business-account-settings-.md
@@ -1,7 +1,6 @@
 ---
 title: Update Windows Store for Business account settings (Windows 10)
-description: The Account information page in Windows Store for Business shows information about your organization that you can update including country or region organization name default domain and language preference.
-MSHAttr: PreferredLib /library
+description: The Account information page in Windows Store for Business shows information about your organization that you can update, including country or region, organization name, default domain, and language preference.
 ms.assetid: CEFFF451-D7D2-4A35-AF28-4A72B9582585
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/windows-10-mobile-and-mdm.md b/windows/manage/windows-10-mobile-and-mdm.md
index 620f78802f..205d23e3cd 100644
--- a/windows/manage/windows-10-mobile-and-mdm.md
+++ b/windows/manage/windows-10-mobile-and-mdm.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 Mobile and mobile device management (Windows 10)
 description: This guide provides an overview of the mobile device and app management technologies in the Windows 10 Mobile operating system.
-MSHAttr: PreferredLib /library
 ms.assetid: 6CAA1004-CB65-4FEC-9B84-61AAD2125E5E
 keywords: ["telemetry", "BYOD", "MDM"]
 ms.prod: W10
@@ -17,16 +16,6 @@ author: jdeckerMS
 
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Overview](#overview)
--   [Device deployment](#device-deployment--)
--   [Device configuration](#device-configuration)
--   [App management](#--app-management)
--   [Device operations](#device-operations)
--   [Device retirement](#device-retirement)
--   [Related topics](#related-topics)
-
 This guide provides an overview of the mobile device and app management technologies in the Windows 10 Mobile operating system. It describes how mobile device management (MDM) systems use the built-in device management client to deploy, configure, maintain, and support phones and small tablets running Windows 10 Mobile.
 
 Bring Your Own Device (BYOD—that is, personal devices) and corporate devices are key scenarios that Windows 10 Mobile MDM capabilities support. The operating system offers a flexible approach to registering devices with directory services and MDM systems, and IT organizations can provision comprehensive device-configuration profiles based on their company’s need to control and secure mobile business data.
diff --git a/windows/manage/windows-10-start-layout-options-and-policies.md b/windows/manage/windows-10-start-layout-options-and-policies.md
index 1b2a6fc5a0..245bf282ea 100644
--- a/windows/manage/windows-10-start-layout-options-and-policies.md
+++ b/windows/manage/windows-10-start-layout-options-and-policies.md
@@ -1,7 +1,6 @@
 ---
 title: Manage Windows 10 Start layout options (Windows 10)
 description: Organizations might want to deploy a customized Start screen and menu to devices running Windows 10 Enterprise or Windows 10 Education.
-MSHAttr: PreferredLib /library
 ms.assetid: 2E94743B-6A49-463C-9448-B7DD19D9CD6A
 keywords: ["start screen", "start menu"]
 ms.prod: W10
diff --git a/windows/manage/windows-store-for-business.md b/windows/manage/windows-store-for-business.md
index 5d39736f44..d02d2373f5 100644
--- a/windows/manage/windows-store-for-business.md
+++ b/windows/manage/windows-store-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Store for Business (Windows 10)
-description: Welcome to the Windows Store for Business You can use the Store for Business to find acquire distribute and manage apps for your organization.
-MSHAttr: PreferredLib /library
+description: Welcome to the Windows Store for Business You can use the Store for Business, to find, acquire, distribute, and manage apps for your organization.
 ms.assetid: 527E611E-4D47-44F0-9422-DCC2D1ACBAB8
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/manage/working-with-line-of-business-apps.md b/windows/manage/working-with-line-of-business-apps.md
index 6edb576eab..82ac833b02 100644
--- a/windows/manage/working-with-line-of-business-apps.md
+++ b/windows/manage/working-with-line-of-business-apps.md
@@ -1,7 +1,6 @@
 ---
-title: Working with line of business apps (Windows 10)
-description: Your company can make line of business (LOB) applications available through Windows Store for Business. These apps are custom to your company – they might be internal business apps or apps specific to your business or industry.
-MSHAttr: PreferredLib /library
+title: Working with line-of-business apps (Windows 10)
+description: Your company can make line-of-business (LOB) applications available through Windows Store for Business. These apps are custom to your company – they might be internal business apps, or apps specific to your business or industry.
 ms.assetid: 95EB7085-335A-447B-84BA-39C26AEB5AC7
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/plan/act-community-ratings-and-process.md b/windows/plan/act-community-ratings-and-process.md
index 1ad803ae28..90c94ca481 100644
--- a/windows/plan/act-community-ratings-and-process.md
+++ b/windows/plan/act-community-ratings-and-process.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Community Ratings and Process (Windows 10)
 description: The Application Compatibility Toolkit (ACT) Community uses the Microsoft® Compatibility Exchange to share compatibility ratings between all registered ACT Community members.
-MSHAttr: PreferredLib /library
 ms.assetid: be6c8c71-785b-4adf-a375-64ca7d24e26c
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-database-configuration.md b/windows/plan/act-database-configuration.md
index 59b1d87861..528cd9a8e2 100644
--- a/windows/plan/act-database-configuration.md
+++ b/windows/plan/act-database-configuration.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Database Configuration (Windows 10)
 description: The Application Compatibility Toolkit (ACT) uses a Microsoft® SQL Server® database for storing and sharing compatibility issue data.
-MSHAttr: PreferredLib /library
 ms.assetid: 032bbfe0-86fa-48ff-b638-b9d6a908c45e
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-database-migration.md b/windows/plan/act-database-migration.md
index 0e931b613e..38d1886347 100644
--- a/windows/plan/act-database-migration.md
+++ b/windows/plan/act-database-migration.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Database Migration (Windows 10)
 description: The schema for an ACT database can change when ACT is updated or when a new version of ACT is released.
-MSHAttr: PreferredLib /library
 ms.assetid: b13369b4-1fb7-4889-b0b8-6d0ab61aac3d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-deployment-options.md b/windows/plan/act-deployment-options.md
index 0473589993..bf817c11b1 100644
--- a/windows/plan/act-deployment-options.md
+++ b/windows/plan/act-deployment-options.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Deployment Options (Windows 10)
-description: While planning your deployment of the Application Compatibility Toolkit (ACT) consider which computers you want running the various tools packages and services for ACT.
-MSHAttr: PreferredLib /library
+description: While planning your deployment of the Application Compatibility Toolkit (ACT), consider which computers you want running the various tools, packages, and services for ACT.
 ms.assetid: 90d56dd8-8d57-44e8-bf7a-29aabede45ba
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-glossary.md b/windows/plan/act-glossary.md
index fdb8d48d9e..ed5fb09904 100644
--- a/windows/plan/act-glossary.md
+++ b/windows/plan/act-glossary.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Glossary (Windows 10)
 description: The following table lists terms and definitions used by the Application Compatibility Toolkit (ACT).
-MSHAttr: PreferredLib /library
 ms.assetid: 984d1cce-c1ac-4aa8-839a-a23e15da6f32
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-lps-share-permissions.md b/windows/plan/act-lps-share-permissions.md
index 98b8051bc5..f9299c2fed 100644
--- a/windows/plan/act-lps-share-permissions.md
+++ b/windows/plan/act-lps-share-permissions.md
@@ -1,7 +1,6 @@
 ---
 title: ACT LPS Share Permissions (Windows 10)
-description: To upload log files to the ACT Log Processing Service (LPS) share certain permissions must be set at the share level and folder level.
-MSHAttr: PreferredLib /library
+description: To upload log files to the ACT Log Processing Service (LPS) share, certain permissions must be set at the share level and folder level.
 ms.assetid: 51f6ddf7-f424-4abe-a0e0-71fe616f9e84
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-product-and-documentation-resources.md b/windows/plan/act-product-and-documentation-resources.md
index 6891aeef31..54cb4635de 100644
--- a/windows/plan/act-product-and-documentation-resources.md
+++ b/windows/plan/act-product-and-documentation-resources.md
@@ -1,7 +1,6 @@
 ---
 title: ACT Product and Documentation Resources (Windows 10)
 description: The following sections provide links to resources and reference material for the Application Compatibility Toolkit (ACT).
-MSHAttr: PreferredLib /library
 ms.assetid: c7954b5a-164d-4548-af58-cd3a1de5cc43
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-tools-packages-and-services.md b/windows/plan/act-tools-packages-and-services.md
index 066c243663..5d3ef9ba47 100644
--- a/windows/plan/act-tools-packages-and-services.md
+++ b/windows/plan/act-tools-packages-and-services.md
@@ -1,7 +1,6 @@
 ---
-title: ACT Tools Packages and Services (Windows 10)
+title: ACT Tools, Packages, and Services (Windows 10)
 description: The Application Compatibility Toolkit is included with the Windows ADK. Download the Windows ADK.
-MSHAttr: PreferredLib /library
 ms.assetid: f5a16548-7d7b-4be9-835e-c06158dd0b89
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/act-user-interface-reference.md b/windows/plan/act-user-interface-reference.md
index f6ad2de60f..a121803d67 100644
--- a/windows/plan/act-user-interface-reference.md
+++ b/windows/plan/act-user-interface-reference.md
@@ -1,7 +1,6 @@
 ---
 title: ACT User Interface Reference (Windows 10)
-description: This section contains information about the user interface for Application Compatibility Manager (ACM) which is a tool in the Application Compatibility Toolkit (ACT).
-MSHAttr: PreferredLib /library
+description: This section contains information about the user interface for Application Compatibility Manager (ACM), which is a tool in the Application Compatibility Toolkit (ACT).
 ms.assetid: 303d3dd7-2cc1-4f5f-b032-b7e288b04893
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/activating-and-closing-windows-in-acm.md b/windows/plan/activating-and-closing-windows-in-acm.md
index 5318a3e808..3e7eaaef87 100644
--- a/windows/plan/activating-and-closing-windows-in-acm.md
+++ b/windows/plan/activating-and-closing-windows-in-acm.md
@@ -1,7 +1,6 @@
 ---
 title: Activating and Closing Windows in ACM (Windows 10)
 description: The Windows dialog box shows the windows that are open in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
 ms.assetid: 747bf356-d861-4ce7-933e-fa4ecfac7be5
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/adding-or-editing-a-solution.md b/windows/plan/adding-or-editing-a-solution.md
index 34a37dc15d..a3ebf8c8ff 100644
--- a/windows/plan/adding-or-editing-a-solution.md
+++ b/windows/plan/adding-or-editing-a-solution.md
@@ -1,7 +1,6 @@
 ---
 title: Adding or Editing a Solution (Windows 10)
-description: If you find your own solutions to compatibility issues you can enter the solutions in Application Compatibility Manager (ACM). You can use the Microsoft Compatibility Exchange to upload solutions to Microsoft Corporation.
-MSHAttr: PreferredLib /library
+description: If you find your own solutions to compatibility issues, you can enter the solutions in Application Compatibility Manager (ACM). You can use the Microsoft Compatibility Exchange to upload solutions to Microsoft Corporation.
 ms.assetid: 86cb8804-d577-4af6-b96f-5e0409784a23
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/adding-or-editing-an-issue.md b/windows/plan/adding-or-editing-an-issue.md
index f6bc666821..51a8522a05 100644
--- a/windows/plan/adding-or-editing-an-issue.md
+++ b/windows/plan/adding-or-editing-an-issue.md
@@ -1,7 +1,6 @@
 ---
 title: Adding or Editing an Issue (Windows 10)
-description: In Application Compatibility Manager (ACM) you can enter information about the compatibility issues that you discover.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), you can enter information about the compatibility issues that you discover.
 ms.assetid: 8a9fff79-9f88-4ce2-a4e6-b9382f28143d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/analyzing-your-compatibility-data.md b/windows/plan/analyzing-your-compatibility-data.md
index 614cdcf8b4..4b145ad92f 100644
--- a/windows/plan/analyzing-your-compatibility-data.md
+++ b/windows/plan/analyzing-your-compatibility-data.md
@@ -1,7 +1,6 @@
 ---
 title: Analyzing Your Compatibility Data (Windows 10)
 description: This section provides information about viewing and working with your compatibility data in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
 ms.assetid: b98f3d74-fe22-41a2-afe8-2eb2799933a1
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/application-compatibility-toolkit--act--technical-reference.md b/windows/plan/application-compatibility-toolkit--act--technical-reference.md
index e04f20b054..6544f9dc8e 100644
--- a/windows/plan/application-compatibility-toolkit--act--technical-reference.md
+++ b/windows/plan/application-compatibility-toolkit--act--technical-reference.md
@@ -1,7 +1,6 @@
 ---
 title: Application Compatibility Toolkit (ACT) Technical Reference (Windows 10)
-description: The Microsoft® Application Compatibility Toolkit (ACT) helps you determine whether the applications devices and computers in your organization are compatible with versions of the Windows® operating system.
-MSHAttr: PreferredLib /library
+description: The Microsoft® Application Compatibility Toolkit (ACT) helps you determine whether the applications, devices, and computers in your organization are compatible with versions of the Windows® operating system.
 ms.assetid: d90d38b2-2718-4481-90eb-4480719627ba
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/application-dialog-box.md b/windows/plan/application-dialog-box.md
index 0015874f23..1700305f86 100644
--- a/windows/plan/application-dialog-box.md
+++ b/windows/plan/application-dialog-box.md
@@ -1,7 +1,6 @@
 ---
 title: Application Dialog Box (Windows 10)
-description: In Application Compatibility Manager (ACM) the Application dialog box shows information about the selected application.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), the Application dialog box shows information about the selected application.
 ms.assetid: a43e85a6-3cd4-4235-bc4d-01e4d097db7e
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/applying-filters-to-data-in-the-sua-tool.md b/windows/plan/applying-filters-to-data-in-the-sua-tool.md
index 87e27e703a..7f960b8cf6 100644
--- a/windows/plan/applying-filters-to-data-in-the-sua-tool.md
+++ b/windows/plan/applying-filters-to-data-in-the-sua-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Applying Filters to Data in the SUA Tool (Windows 10)
-description: On the user interface for the Standard User Analyzer (SUA) tool you can apply filters to the issues that the tool has found so that you can view only the information that interests you.
-MSHAttr: PreferredLib /library
+description: On the user interface for the Standard User Analyzer (SUA) tool, you can apply filters to the issues that the tool has found so that you can view only the information that interests you.
 ms.assetid: 48c39919-3501-405d-bcf5-d2784cbb011f
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/available-data-types-and-operators-in-compatibility-administrator.md b/windows/plan/available-data-types-and-operators-in-compatibility-administrator.md
index 3279ef8724..bc5e40d571 100644
--- a/windows/plan/available-data-types-and-operators-in-compatibility-administrator.md
+++ b/windows/plan/available-data-types-and-operators-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Available Data Types and Operators in Compatibility Administrator (Windows 10)
-description: The Compatibility Administrator tool provides a way to query your custom compatibility databases.
-MSHAttr: PreferredLib /library
+description: The Compatibility Administrator tool provides a way to query your custom-compatibility databases.
 ms.assetid: 67d9c03e-ab9d-4fda-8a55-8c5b90266d3b
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/best-practice-recommendations-for-windows-to-go.md b/windows/plan/best-practice-recommendations-for-windows-to-go.md
index 5004928473..4f9850c51c 100644
--- a/windows/plan/best-practice-recommendations-for-windows-to-go.md
+++ b/windows/plan/best-practice-recommendations-for-windows-to-go.md
@@ -1,9 +1,8 @@
 ---
 title: Best practice recommendations for Windows To Go (Windows 10)
 description: Best practice recommendations for Windows To Go
-MSHAttr: PreferredLib /library
 ms.assetid: 05e6e0ab-94ed-4c0c-a195-0abd006f0a86
-keywords: ["best practices USB device boot"]
+keywords: ["best practices, USB, device, boot"]
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/plan/categorizing-your-compatibility-data.md b/windows/plan/categorizing-your-compatibility-data.md
index 0ea45b55f0..637af36069 100644
--- a/windows/plan/categorizing-your-compatibility-data.md
+++ b/windows/plan/categorizing-your-compatibility-data.md
@@ -1,6 +1,5 @@
 ---
 title: Categorizing Your Compatibility Data (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 6420f012-316f-4ef0-bfbb-14baaa664e6e
 description: 
 ms.prod: W10
diff --git a/windows/plan/change-history-for-plan-for-windows-10-deployment.md b/windows/plan/change-history-for-plan-for-windows-10-deployment.md
index 5f677955eb..d5ea58e8d1 100644
--- a/windows/plan/change-history-for-plan-for-windows-10-deployment.md
+++ b/windows/plan/change-history-for-plan-for-windows-10-deployment.md
@@ -1,7 +1,6 @@
 ---
 title: Change history for Plan for Windows 10 deployment (Windows 10)
 description: This topic lists new and updated topics in the Plan for Windows 10 deployment documentation for Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: 70D9F4F8-F2A4-4FB4-9459-5B2BE7BCAC66
 ms.prod: W10
 ms.mktglfcycl: deploy
diff --git a/windows/plan/chromebook-migration-guide.md b/windows/plan/chromebook-migration-guide.md
index 5f414fdad8..87c111f100 100644
--- a/windows/plan/chromebook-migration-guide.md
+++ b/windows/plan/chromebook-migration-guide.md
@@ -1,7 +1,6 @@
 ---
 title: Chromebook migration guide (Windows 10)
-description: In this guide you will learn how to migrate a Google Chromebook based learning environment to a Windows 10 based learning environment.
-MSHAttr: PreferredLib /library
+description: In this guide you will learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment.
 ms.assetid: 7A1FA48A-C44A-4F59-B895-86D4D77F8BEA
 keywords: ["migrate", "automate", "device"]
 ms.prod: W10
@@ -17,27 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Plan Chromebook migration](#plan-migration)
--   [Plan for app migration or replacement](#plan-app-migrate-replace)
--   [Plan for migration of user and device settings](#plan-migrate-user-device-settings)
--   [Plan for email migration](#plan-email-migrate)
--   [Plan for cloud storage migration](#plan-cloud-storage-migration)
--   [Plan for cloud services migration](#plan-cloud-services)
--   [Plan for Windows device deployment](#plan-windevice-deploy)
--   [Perform Chromebook migration](#perform-chromebook-migration)
--   [Perform network infrastructure remediation](#network-infra-remediation)
--   [Perform AD DS and Azure AD services deployment or remediation](#perform-ad-ds-and-azure-ad-services-deployment-or-remediation)
--   [Prepare device, user, and app management systems](#prepare-device--user--and-app-management-systems)
--   [Perform app migration or replacement](#perform-app-migration-or-replacement-)
--   [Perform migration of user and device settings](#migrate-user-device-settings)
--   [Perform email migration](#perform-email-migration)
--   [Perform cloud storage migration](#perform-cloud-storage-migration)
--   [Perform cloud services migration](#perform-cloud-services-migration)
--   [Perform Windows device deployment](#perform-windows-device-deployment)
--   [Related topics](#related-topics)
-
 In this guide you will learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment. You will learn how to perform the necessary planning steps, including Windows device deployment, migration of user and device settings, app migration or replacement, and cloud storage migration. You will then learn the best method to perform the migration by using automated deployment and migration tools.
 
 ## <a href="" id="plan-migration"></a>Plan Chromebook migration
diff --git a/windows/plan/common-compatibility-issues.md b/windows/plan/common-compatibility-issues.md
index 2dadbc7165..e9feba9487 100644
--- a/windows/plan/common-compatibility-issues.md
+++ b/windows/plan/common-compatibility-issues.md
@@ -1,6 +1,5 @@
 ---
 title: Common Compatibility Issues (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: f5ad621d-bda2-45b5-ae85-bc92970f602f
 description: 
 ms.prod: W10
diff --git a/windows/plan/compatibility-administrator-users-guide.md b/windows/plan/compatibility-administrator-users-guide.md
index 511c4822fa..06246f50b6 100644
--- a/windows/plan/compatibility-administrator-users-guide.md
+++ b/windows/plan/compatibility-administrator-users-guide.md
@@ -1,6 +1,5 @@
 ---
 title: Compatibility Administrator User's Guide (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 0ce05f66-9009-4739-a789-60f3ce380e76
 description: 
 ms.prod: W10
diff --git a/windows/plan/compatibility-fix-database-management-strategies-and-deployment.md b/windows/plan/compatibility-fix-database-management-strategies-and-deployment.md
index 19e9b07326..9abe28e94d 100644
--- a/windows/plan/compatibility-fix-database-management-strategies-and-deployment.md
+++ b/windows/plan/compatibility-fix-database-management-strategies-and-deployment.md
@@ -1,6 +1,5 @@
 ---
 title: Compatibility Fix Database Management Strategies and Deployment (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: fdfbf02f-c4c4-4739-a400-782204fd3c6c
 description: 
 ms.prod: W10
diff --git a/windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md b/windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
index 3f88a1ab59..1efec32cb1 100644
--- a/windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
+++ b/windows/plan/compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md
@@ -1,7 +1,6 @@
 ---
-title: Compatibility Fixes for Windows 10 Windows 8 Windows 7 and Windows Vista (Windows 10)
+title: Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista (Windows 10)
 description: You can fix some compatibility issues that are due to the changes made between Windows operating system versions. These issues can include User Account Control (UAC) restrictions.
-MSHAttr: PreferredLib /library
 ms.assetid: cd51c824-557f-462a-83bb-54b0771b7dff
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/compatibility-monitor-users-guide.md b/windows/plan/compatibility-monitor-users-guide.md
index cddbc75a3c..f5b56c4858 100644
--- a/windows/plan/compatibility-monitor-users-guide.md
+++ b/windows/plan/compatibility-monitor-users-guide.md
@@ -1,7 +1,6 @@
 ---
 title: Compatibility Monitor User's Guide (Windows 10)
 description: Compatibility Monitor is a tool in the runtime analysis package that you can use to monitor applications for compatibility issues. You can also use the Compatibility Monitor tool to submit compatibility feedback.
-MSHAttr: PreferredLib /library
 ms.assetid: 67d6eff0-1576-44bd-99b4-a3ffa5e205ac
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/computer-dialog-box.md b/windows/plan/computer-dialog-box.md
index 86e519858d..07af472c32 100644
--- a/windows/plan/computer-dialog-box.md
+++ b/windows/plan/computer-dialog-box.md
@@ -1,7 +1,6 @@
 ---
 title: Computer Dialog Box (Windows 10)
-description: In Application Compatibility Manager (ACM) the Computer dialog box shows information about the selected computer.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), the Computer dialog box shows information about the selected computer.
 ms.assetid: f89cbb28-adcd-41cd-9a54-402bc4aaffd9
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/configuring-act.md b/windows/plan/configuring-act.md
index eaea35a1f2..ef72f68d43 100644
--- a/windows/plan/configuring-act.md
+++ b/windows/plan/configuring-act.md
@@ -1,7 +1,6 @@
 ---
 title: Configuring ACT (Windows 10)
 description: This section provides information about setting up the Application Compatibility Toolkit (ACT) in your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: aacbe35e-ea40-47ac-bebf-ed2660c8fd86
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md b/windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
index b11a51de0b..26d4a51ca0 100644
--- a/windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
+++ b/windows/plan/creating-a-custom-compatibility-fix-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Creating a Custom Compatibility Fix in Compatibility Administrator (Windows 10)
 description: The Compatibility Administrator tool uses the term fix to describe the combination of compatibility information added to a customized database for a specific application.
-MSHAttr: PreferredLib /library
 ms.assetid: e4f2853a-0e46-49c5-afd7-0ed12f1fe0c2
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,13 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [What is a Compatibility Fix?](#what-is-a-compatibility-fix-)
--   [Searching for Existing Compatibility Fixes](#searching-for-existing-compatibility-fixes)
--   [Creating a New Compatibility Fix](#creating-a-new-compatibility-fix)
--   [Related topics](#related-topics)
-
 The Compatibility Administrator tool uses the term *fix* to describe the combination of compatibility information added to a customized database for a specific application. This combination can include single application fixes, groups of fixes that work together as a compatibility mode, and blocking and non-blocking AppHelp messages.
 
 **Important**  
diff --git a/windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md b/windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
index bc04d03237..75f3706089 100644
--- a/windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
+++ b/windows/plan/creating-a-custom-compatibility-mode-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Creating a Custom Compatibility Mode in Compatibility Administrator (Windows 10)
-description: Windows® provides several compatibility modes groups of compatibility fixes found to resolve many common application compatibility issues.
-MSHAttr: PreferredLib /library
+description: Windows® provides several compatibility modes, groups of compatibility fixes found to resolve many common application-compatibility issues.
 ms.assetid: 661a1c0d-267f-4a79-8445-62a9a98d09b0
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,13 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [What Is a Compatibility Mode?](#what-is-a-compatibility-mode-)
--   [Searching for Existing Compatibility Modes](#searching-for-existing-compatibility-modes)
--   [Creating a New Compatibility Mode](#creating-a-new-compatibility-mode)
--   [Related topics](#related-topics)
-
 Windows® provides several *compatibility modes*, groups of compatibility fixes found to resolve many common application-compatibility issues. While working with Compatibility Administrator, you might decide to group some of your individual compatibility fixes into a custom-compatibility mode, which you can then deploy and use on any of your compatibility databases.
 
 ## What Is a Compatibility Mode?
diff --git a/windows/plan/creating-a-runtime-analysis-package.md b/windows/plan/creating-a-runtime-analysis-package.md
index 05d5fbba79..8246a9de4a 100644
--- a/windows/plan/creating-a-runtime-analysis-package.md
+++ b/windows/plan/creating-a-runtime-analysis-package.md
@@ -1,7 +1,6 @@
 ---
-title: Creating a Runtime Analysis Package (Windows 10)
-description: In Application Compatibility Manager (ACM) you can create runtime analysis packages which you can then deploy to computers for compatibility testing in your test environment.
-MSHAttr: PreferredLib /library
+title: Creating a Runtime-Analysis Package (Windows 10)
+description: In Application Compatibility Manager (ACM), you can create runtime-analysis packages, which you can then deploy to computers for compatibility testing in your test environment.
 ms.assetid: 3c703ebe-46b3-4dcd-b355-b28344bc159b
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md b/windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md
index a14aca8956..4fc5707012 100644
--- a/windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md
+++ b/windows/plan/creating-an-apphelp-message-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Creating an AppHelp Message in Compatibility Administrator (Windows 10)
-description: The Compatibility Administrator tool enables you to create an AppHelp text message. This is a blocking or non blocking message that appears when a user starts an application that you know has major functionality issues on the Windows® operating system.
-MSHAttr: PreferredLib /library
+description: The Compatibility Administrator tool enables you to create an AppHelp text message. This is a blocking or non-blocking message that appears when a user starts an application that you know has major functionality issues on the Windows® operating system.
 ms.assetid: 5c6e89f5-1942-4aa4-8439-ccf0ecd02848
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,14 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Blocking Versus Non-Blocking AppHelp Messages](#blocking-versus-non-blocking-apphelp-messages)
--   [Searching for Existing Compatibility Fixes](#searching-for-existing-compatibility-fixes)
--   [Creating a New AppHelp Message](#creating-a-new-apphelp-message)
--   [Issues with AppHelp Messages and Computers Running Windows 2000](#issues-with-apphelp-messages-and-computers-running-windows-2000)
--   [Related topics](#related-topics)
-
 The Compatibility Administrator tool enables you to create an AppHelp text message. This is a blocking or non-blocking message that appears when a user starts an application that you know has major functionality issues on the Windows® operating system.
 
 ## Blocking Versus Non-Blocking AppHelp Messages
diff --git a/windows/plan/creating-an-enterprise-environment-for-compatibility-testing.md b/windows/plan/creating-an-enterprise-environment-for-compatibility-testing.md
index aff435ef7f..339ef48aaf 100644
--- a/windows/plan/creating-an-enterprise-environment-for-compatibility-testing.md
+++ b/windows/plan/creating-an-enterprise-environment-for-compatibility-testing.md
@@ -1,7 +1,6 @@
 ---
 title: Creating an Enterprise Environment for Compatibility Testing (Windows 10)
 description: The goal of the test environment is to model the operating system that you want to deploy and assess compatibility before deploying the operating system to your production environment.
-MSHAttr: PreferredLib /library
 ms.assetid: cbf6d8b6-7ebc-4faa-bbbd-e02653ed4adb
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,14 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Modeling the Production Environment](#modeling-the-production-environment)
--   [Configuring the Test Environment for Automated Testing](#configuring-the-test-environment-for-automated-testing)
--   [Determining When Virtualization Is Appropriate](#determining-when-virtualization-is-appropriate)
--   [Testing Methodology](#testing-methodology)
--   [Related topics](#related-topics)
-
 The goal of the test environment is to model the operating system that you want to deploy and assess compatibility before deploying the operating system to your production environment. Your test environment is composed of computers on which the new operating system is installed. Your test environment can be a long-term investment. Consider retaining the test environment after deployment to assist in future deployment projects.
 
 ## Modeling the Production Environment
diff --git a/windows/plan/creating-an-inventory-collector-package.md b/windows/plan/creating-an-inventory-collector-package.md
index 292f527b37..01d9dcf89c 100644
--- a/windows/plan/creating-an-inventory-collector-package.md
+++ b/windows/plan/creating-an-inventory-collector-package.md
@@ -1,7 +1,6 @@
 ---
-title: Creating an Inventory Collector Package (Windows 10)
-description: You can use Application Compatibility Manager (ACM) to create an inventory collector package.
-MSHAttr: PreferredLib /library
+title: Creating an Inventory-Collector Package (Windows 10)
+description: You can use Application Compatibility Manager (ACM) to create an inventory-collector package.
 ms.assetid: 61d041d6-e308-47b3-921b-709d72926d6d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/creating-and-editing-issues-and-solutions.md b/windows/plan/creating-and-editing-issues-and-solutions.md
index 21d0225fd8..d4e183c235 100644
--- a/windows/plan/creating-and-editing-issues-and-solutions.md
+++ b/windows/plan/creating-and-editing-issues-and-solutions.md
@@ -1,7 +1,6 @@
 ---
 title: Creating and Editing Issues and Solutions (Windows 10)
-description: This section provides step by step instructions for adding and editing application compatibility issues and solutions. Your issue and solution data can be uploaded to Microsoft through the Microsoft® Compatibility Exchange.
-MSHAttr: PreferredLib /library
+description: This section provides step-by-step instructions for adding and editing application compatibility issues and solutions. Your issue and solution data can be uploaded to Microsoft through the Microsoft® Compatibility Exchange.
 ms.assetid: b64fe4e0-24bd-4bbd-9645-80ae5644e774
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/customizing-your-report-views.md b/windows/plan/customizing-your-report-views.md
index 2e6d96a7a0..725122266c 100644
--- a/windows/plan/customizing-your-report-views.md
+++ b/windows/plan/customizing-your-report-views.md
@@ -1,7 +1,6 @@
 ---
 title: Customizing Your Report Views (Windows 10)
 description: You can customize how you view your report data in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
 ms.assetid: ba8da888-6749-43b4-8efb-4f26c7954721
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/data-sent-through-the-microsoft-compatibility-exchange.md b/windows/plan/data-sent-through-the-microsoft-compatibility-exchange.md
index 7a79f4342f..4f5456aa5d 100644
--- a/windows/plan/data-sent-through-the-microsoft-compatibility-exchange.md
+++ b/windows/plan/data-sent-through-the-microsoft-compatibility-exchange.md
@@ -1,7 +1,6 @@
 ---
 title: Data Sent Through the Microsoft Compatibility Exchange (Windows 10)
-description: The Microsoft Compatibility Exchange propagates data of various types between Microsoft Corporation independent software vendors (ISVs) and the Application Compatibility Toolkit (ACT) Community.
-MSHAttr: PreferredLib /library
+description: The Microsoft Compatibility Exchange propagates data of various types between Microsoft Corporation, independent software vendors (ISVs) and the Application Compatibility Toolkit (ACT) Community.
 ms.assetid: 3ec61e33-9db8-4367-99d5-e05c2f50e144
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/deciding-whether-to-fix-an-application-or-deploy-a-workaround.md b/windows/plan/deciding-whether-to-fix-an-application-or-deploy-a-workaround.md
index 1301f28581..ed48afa8a9 100644
--- a/windows/plan/deciding-whether-to-fix-an-application-or-deploy-a-workaround.md
+++ b/windows/plan/deciding-whether-to-fix-an-application-or-deploy-a-workaround.md
@@ -1,7 +1,6 @@
 ---
 title: Deciding Whether to Fix an Application or Deploy a Workaround (Windows 10)
 description: You can fix a compatibility issue by changing the code for the application or by deploying a workaround.
-MSHAttr: PreferredLib /library
 ms.assetid: e495d0c8-bfba-4537-bccd-64c4b52206f1
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/deciding-which-applications-to-test.md b/windows/plan/deciding-which-applications-to-test.md
index ebf35870af..f5719dbdb7 100644
--- a/windows/plan/deciding-which-applications-to-test.md
+++ b/windows/plan/deciding-which-applications-to-test.md
@@ -1,7 +1,6 @@
 ---
 title: Deciding Which Applications to Test (Windows 10)
-description: Before starting your compatibility testing on the version of Windows that you want to deploy you can use the Application Compatibility Toolkit (ACT) to identify which applications should be the focus of your testing.
-MSHAttr: PreferredLib /library
+description: Before starting your compatibility testing on the version of Windows that you want to deploy, you can use the Application Compatibility Toolkit (ACT) to identify which applications should be the focus of your testing.
 ms.assetid: d7c1c28f-b7b4-43ac-bf87-2910a2b603bf
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/deleting-a-data-collection-package.md b/windows/plan/deleting-a-data-collection-package.md
index eed0070048..ade04833e1 100644
--- a/windows/plan/deleting-a-data-collection-package.md
+++ b/windows/plan/deleting-a-data-collection-package.md
@@ -1,7 +1,6 @@
 ---
-title: Deleting a Data Collection Package (Windows 10)
-description: In Application Compatibility Manager (ACM) you can delete any of your existing data collection packages from the database.
-MSHAttr: PreferredLib /library
+title: Deleting a Data-Collection Package (Windows 10)
+description: In Application Compatibility Manager (ACM), you can delete any of your existing data-collection packages from the database.
 ms.assetid: 1b397d7a-7216-4078-93d9-47c7becbf73e
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/deploying-a-runtime-analysis-package.md b/windows/plan/deploying-a-runtime-analysis-package.md
index e9b54a8843..09c49b1cc9 100644
--- a/windows/plan/deploying-a-runtime-analysis-package.md
+++ b/windows/plan/deploying-a-runtime-analysis-package.md
@@ -1,7 +1,6 @@
 ---
-title: Deploying a Runtime Analysis Package (Windows 10)
-description: When you deploy a runtime analysis package you are deploying it to your test environment for compatibility testing.
-MSHAttr: PreferredLib /library
+title: Deploying a Runtime-Analysis Package (Windows 10)
+description: When you deploy a runtime-analysis package, you are deploying it to your test environment for compatibility testing.
 ms.assetid: 304bf0be-0e7c-4c5f-baac-bed7f8bef509
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/deploying-an-inventory-collector-package.md b/windows/plan/deploying-an-inventory-collector-package.md
index 5dd57a1c15..a3d471a410 100644
--- a/windows/plan/deploying-an-inventory-collector-package.md
+++ b/windows/plan/deploying-an-inventory-collector-package.md
@@ -1,6 +1,5 @@
 ---
-title: Deploying an Inventory Collector Package (Windows 10)
-MSHAttr: PreferredLib /library
+title: Deploying an Inventory-Collector Package (Windows 10)
 ms.assetid: 8726ff71-0d17-4449-bdb7-66957ae51c62
 description: 
 ms.prod: W10
diff --git a/windows/plan/deployment-considerations-for-windows-to-go.md b/windows/plan/deployment-considerations-for-windows-to-go.md
index 7e282b0e20..a7c14e1f47 100644
--- a/windows/plan/deployment-considerations-for-windows-to-go.md
+++ b/windows/plan/deployment-considerations-for-windows-to-go.md
@@ -1,9 +1,8 @@
 ---
 title: Deployment considerations for Windows To Go (Windows 10)
 description: Deployment considerations for Windows To Go
-MSHAttr: PreferredLib /library
 ms.assetid: dcfc5d96-b96b-44cd-ab65-416b5611c65e
-keywords: ["deploy mobile device USB boot image workspace driver"]
+keywords: ["deploy, mobile, device, USB, boot, image, workspace, driver"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/plan/device-dialog-box.md b/windows/plan/device-dialog-box.md
index c69f06a77d..ae65f7330b 100644
--- a/windows/plan/device-dialog-box.md
+++ b/windows/plan/device-dialog-box.md
@@ -1,7 +1,6 @@
 ---
 title: Device Dialog Box (Windows 10)
-description: In Application Compatibility Manager (ACM) the Device dialog box shows information about the selected device.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), the Device dialog box shows information about the selected device.
 ms.assetid: 5bd7cfda-31ea-4967-8b64-6c0425092f4e
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md b/windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
index 79b34e4b74..0f3ad7aa3d 100644
--- a/windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
+++ b/windows/plan/enabling-and-disabling-compatibility-fixes-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Enabling and Disabling Compatibility Fixes in Compatibility Administrator (Windows 10)
 description: You can disable and enable individual compatibility fixes in your customized databases for testing and troubleshooting purposes.
-MSHAttr: PreferredLib /library
 ms.assetid: 6bd4a7c5-0ed9-4a35-948c-c438aa4d6cb6
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/example-filter-queries.md b/windows/plan/example-filter-queries.md
index acb304c278..a128516e95 100644
--- a/windows/plan/example-filter-queries.md
+++ b/windows/plan/example-filter-queries.md
@@ -1,7 +1,6 @@
 ---
 title: Example Filter Queries (Windows 10)
-description: You can filter your compatibility issue data or reports by selecting specific restriction criteria.
-MSHAttr: PreferredLib /library
+description: You can filter your compatibility-issue data or reports by selecting specific restriction criteria.
 ms.assetid: eae59380-56cc-4d57-bd2c-11a0e3c689c9
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/exporting-a-data-collection-package.md b/windows/plan/exporting-a-data-collection-package.md
index 63e4760f00..c1eef9d0ad 100644
--- a/windows/plan/exporting-a-data-collection-package.md
+++ b/windows/plan/exporting-a-data-collection-package.md
@@ -1,7 +1,6 @@
 ---
-title: Exporting a Data Collection Package (Windows 10)
-description: In Application Compatibility Manager (ACM) you can export a data collection package as a Windows installer (.msi) file. You can then use the .msi file to install the data collection package on the computers from which you want to gather data.
-MSHAttr: PreferredLib /library
+title: Exporting a Data-Collection Package (Windows 10)
+description: In Application Compatibility Manager (ACM), you can export a data-collection package as a Windows installer (.msi) file. You can then use the .msi file to install the data-collection package on the computers from which you want to gather data.
 ms.assetid: 98fe19e4-9533-4ffc-a275-8b3776ee93ed
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/filtering-your-compatibility-data.md b/windows/plan/filtering-your-compatibility-data.md
index a91e76a732..36776e764a 100644
--- a/windows/plan/filtering-your-compatibility-data.md
+++ b/windows/plan/filtering-your-compatibility-data.md
@@ -1,7 +1,6 @@
 ---
 title: Filtering Your Compatibility Data (Windows 10)
-description: You can use Query Builder to filter your compatibility issue data or reports by selecting specific restriction criteria.
-MSHAttr: PreferredLib /library
+description: You can use Query Builder to filter your compatibility-issue data or reports by selecting specific restriction criteria.
 ms.assetid: b64267b5-83c0-4b4d-a075-0975d3a359c8
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/fixing-applications-by-using-the-sua-tool.md b/windows/plan/fixing-applications-by-using-the-sua-tool.md
index 98fbf2175b..99bd4deb6e 100644
--- a/windows/plan/fixing-applications-by-using-the-sua-tool.md
+++ b/windows/plan/fixing-applications-by-using-the-sua-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Fixing Applications by Using the SUA Tool (Windows 10)
-description: On the user interface for the Standard User Analyzer (SUA) tool you can apply fixes to an application.
-MSHAttr: PreferredLib /library
+description: On the user interface for the Standard User Analyzer (SUA) tool, you can apply fixes to an application.
 ms.assetid: 7f5947b1-977b-4d7e-bb52-fbe8e76f6b8b
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/fixing-compatibility-issues.md b/windows/plan/fixing-compatibility-issues.md
index 3d026c964a..dc3e884415 100644
--- a/windows/plan/fixing-compatibility-issues.md
+++ b/windows/plan/fixing-compatibility-issues.md
@@ -1,7 +1,6 @@
 ---
 title: Fixing Compatibility Issues (Windows 10)
-description: This section provides step by step instructions and describes development tools that you can use to help fix your compatibility issues.
-MSHAttr: PreferredLib /library
+description: This section provides step-by-step instructions and describes development tools that you can use to help fix your compatibility issues.
 ms.assetid: 30ba8d14-a41a-41b3-9019-e8658d6974de
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/guidance-for-education-environments.md b/windows/plan/guidance-for-education-environments.md
index 307c4eb869..91d543470a 100644
--- a/windows/plan/guidance-for-education-environments.md
+++ b/windows/plan/guidance-for-education-environments.md
@@ -1,7 +1,6 @@
 ---
 title: Guidance for education environments (Windows 10)
-description: Find resources to help you plan your deployment of Windows 10 to desktops laptops tablets and other devices in educational institutions.
-MSHAttr: PreferredLib /library
+description: Find resources to help you plan your deployment of Windows 10 to desktops, laptops, tablets, and other devices in educational institutions.
 ms.assetid: 225C9D6F-9329-4DDF-B447-6CE7804E314E
 ms.prod: W10
 ms.mktglfcycl: plan
diff --git a/windows/plan/identifying-computers-for-inventory-collection.md b/windows/plan/identifying-computers-for-inventory-collection.md
index 3d4f8d516e..638addad76 100644
--- a/windows/plan/identifying-computers-for-inventory-collection.md
+++ b/windows/plan/identifying-computers-for-inventory-collection.md
@@ -1,6 +1,5 @@
 ---
 title: Identifying Computers for Inventory Collection (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: f5bf2d89-fff2-4960-a153-dc1146b442fb
 description: 
 ms.prod: W10
@@ -21,15 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Managed and Unmanaged Environments](#bmk-managedunmanaged)
--   [Role-Based Applications](#bmk-rolebasedapplications)
--   [Software Distribution](#bmk-softwaredistribution)
--   [Geographic Distribution](#bmk-geographicdistribution)
--   [Computer Types](#bmk-computertypes)
--   [Related topics](#related-topics)
-
 An inventory-collector package gathers inventory data from the computers on which it is installed. This data includes the following:
 
 -   **System inventory.** Information about the client computer. This information includes the memory capacity, the processor speed, and the processor architecture.
diff --git a/windows/plan/index.md b/windows/plan/index.md
index 16b869cb9d..d947cf3348 100644
--- a/windows/plan/index.md
+++ b/windows/plan/index.md
@@ -1,7 +1,6 @@
 ---
 title: Plan for Windows 10 deployment (Windows 10)
-description: Windows 10 provides new deployment capabilities scenarios and tools by building on technologies introduced in Windows 7 and Windows 8.1 while at the same time introducing new Windows as a service concepts to keep the operating system up to date.
-MSHAttr: PreferredLib /library
+description: Windows 10 provides new deployment capabilities, scenarios, and tools by building on technologies introduced in Windows 7, and Windows 8.1, while at the same time introducing new Windows as a service concepts to keep the operating system up to date.
 ms.assetid: 002F9B79-B50F-40C5-A7A5-0B4770E6EC15
 keywords: ["deploy", "upgrade", "update", "configure"]
 ms.prod: W10
@@ -86,6 +85,8 @@ Windows 10 provides new deployment capabilities, scenarios, and tools by buildi
 
 [Windows Imaging and Configuration Designer](http://go.microsoft.com/fwlink/p/?LinkId=733911)
 
+[Windows 10 and Windows 10 Mobile](../p_ent_nodes/windows-10.md)
+
  
 
  
diff --git a/windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md b/windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
index b1373cb964..2d040ed0be 100644
--- a/windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
+++ b/windows/plan/installing-and-uninstalling-custom-compatibility-databases-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Installing and Uninstalling Custom Compatibility Databases in Compatibility Administrator (Windows 10)
-description: The Compatibility Administrator tool enables the creation and the use of custom compatibility and standard compatibility databases.
-MSHAttr: PreferredLib /library
+description: The Compatibility Administrator tool enables the creation and the use of custom-compatibility and standard-compatibility databases.
 ms.assetid: 659c9d62-5f32-433d-94aa-12141c01368f
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/integration-with-management-solutions-.md b/windows/plan/integration-with-management-solutions-.md
index 580c859250..6c728b2609 100644
--- a/windows/plan/integration-with-management-solutions-.md
+++ b/windows/plan/integration-with-management-solutions-.md
@@ -1,7 +1,6 @@
 ---
 title: Integration with management solutions (Windows 10)
-description: You can integrate Windows Update for Business deployments with existing management tools such as Windows Server Update Services (WSUS) System Center Configuration Manager and Microsoft Intune.
-MSHAttr: PreferredLib /library
+description: You can integrate Windows Update for Business deployments with existing management tools such as Windows Server Update Services (WSUS), System Center Configuration Manager, and Microsoft Intune.
 ms.assetid: E0CB0CD3-4FE1-46BF-BA6F-5A5A8BD14CC9
 keywords: ["update", "upgrade", "deployment", "manage", "tools"]
 ms.prod: w10
@@ -17,13 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [System Center Configuration Manager](#system-center-configuration-manager)
--   [WSUS standalone](#wsus-standalone-)
--   [Enterprise Mobility Suite: Intune](#enterprise-mobility-suite--intune)
--   [Related topics](#related-topics)
-
 You can integrate Windows Update for Business deployments with existing management tools such as Windows Server Update Services (WSUS), System Center Configuration Manager, and Microsoft Intune.
 
 ## System Center Configuration Manager
diff --git a/windows/plan/internet-explorer---web-site-report.md b/windows/plan/internet-explorer---web-site-report.md
index b7ca1ee53d..fdcd6ef921 100644
--- a/windows/plan/internet-explorer---web-site-report.md
+++ b/windows/plan/internet-explorer---web-site-report.md
@@ -1,6 +1,5 @@
 ---
-title: Internet Explorer Web Site Report (Windows 10)
-MSHAttr: PreferredLib /library
+title: Internet Explorer - Web Site Report (Windows 10)
 ms.assetid: f072033d-9d42-47ed-8fb0-dbdc28442910
 description: 
 ms.prod: W10
diff --git a/windows/plan/labeling-data-in-acm.md b/windows/plan/labeling-data-in-acm.md
index 47ebe42fea..d9fe6d9da7 100644
--- a/windows/plan/labeling-data-in-acm.md
+++ b/windows/plan/labeling-data-in-acm.md
@@ -1,7 +1,6 @@
 ---
 title: Labeling Data in ACM (Windows 10)
 description: Application data and its associated compatibility issues can vary within an organization.
-MSHAttr: PreferredLib /library
 ms.assetid: d099c747-e68a-4cad-a639-9f33efab35b3
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/log-file-locations-for-data-collection-packages.md b/windows/plan/log-file-locations-for-data-collection-packages.md
index a139b4ea62..6483bf1b49 100644
--- a/windows/plan/log-file-locations-for-data-collection-packages.md
+++ b/windows/plan/log-file-locations-for-data-collection-packages.md
@@ -1,6 +1,5 @@
 ---
-title: Log File Locations for Data Collection Packages (Windows 10)
-MSHAttr: PreferredLib /library
+title: Log File Locations for Data-Collection Packages (Windows 10)
 ms.assetid: dcc395e7-2d9c-4935-abab-33c5934ce24a
 description: 
 ms.prod: W10
diff --git a/windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md b/windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md
index e74ad9bdf8..d85029f97f 100644
--- a/windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md
+++ b/windows/plan/managing-application-compatibility-fixes-and-custom-fix-databases.md
@@ -1,7 +1,6 @@
 ---
-title: Managing Application Compatibility Fixes and Custom Fix Databases (Windows 10)
-description: This section provides information about managing your application compatibility fixes and custom compatibility fix databases. This section explains the reasons for using compatibility fixes and how to deploy custom compatibility fix databases.
-MSHAttr: PreferredLib /library
+title: Managing Application-Compatibility Fixes and Custom Fix Databases (Windows 10)
+description: This section provides information about managing your application-compatibility fixes and custom-compatibility fix databases. This section explains the reasons for using compatibility fixes and how to deploy custom-compatibility fix databases.
 ms.assetid: 9c2e9396-908e-4a36-ad67-2e40452ce017
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/managing-your-data-collection-packages.md b/windows/plan/managing-your-data-collection-packages.md
index 051b5d923e..eb9af845ad 100644
--- a/windows/plan/managing-your-data-collection-packages.md
+++ b/windows/plan/managing-your-data-collection-packages.md
@@ -1,7 +1,6 @@
 ---
-title: Managing Your Data Collection Packages (Windows 10)
-description: This section provides information about using Application Compatibility Manager (ACM) to manage your data collection packages.
-MSHAttr: PreferredLib /library
+title: Managing Your Data-Collection Packages (Windows 10)
+description: This section provides information about using Application Compatibility Manager (ACM) to manage your data-collection packages.
 ms.assetid: 369ae82f-c8ca-42ec-85df-1b760a74e70a
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/operatingsystem---application-report.md b/windows/plan/operatingsystem---application-report.md
index 3dd70ba18c..b029206eaf 100644
--- a/windows/plan/operatingsystem---application-report.md
+++ b/windows/plan/operatingsystem---application-report.md
@@ -1,7 +1,6 @@
 ---
-title: OperatingSystem Application Report (Windows 10)
+title: OperatingSystem - Application Report (Windows 10)
 description: This section describes the compatibility reports in Application Compatibility Manager (ACM) and how you can work with the reports.
-MSHAttr: PreferredLib /library
 ms.assetid: 9721485b-6092-4974-8cfe-c84472237a57
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/operatingsystem---computer-report.md b/windows/plan/operatingsystem---computer-report.md
index 6f586eabcb..4a49ff56db 100644
--- a/windows/plan/operatingsystem---computer-report.md
+++ b/windows/plan/operatingsystem---computer-report.md
@@ -1,6 +1,5 @@
 ---
-title: OperatingSystem Computer Report (Windows 10)
-MSHAttr: PreferredLib /library
+title: OperatingSystem - Computer Report (Windows 10)
 ms.assetid: ed0a56fc-9f2a-4df0-8cef-3a09d6616de8
 description: 
 ms.prod: W10
diff --git a/windows/plan/operatingsystem---device-report.md b/windows/plan/operatingsystem---device-report.md
index fdbd50d6e7..e4be3521b9 100644
--- a/windows/plan/operatingsystem---device-report.md
+++ b/windows/plan/operatingsystem---device-report.md
@@ -1,6 +1,5 @@
 ---
-title: OperatingSystem Device Report (Windows 10)
-MSHAttr: PreferredLib /library
+title: OperatingSystem - Device Report (Windows 10)
 ms.assetid: 8b5a936f-a92e-46a7-ac44-6edace262355
 description: 
 ms.prod: W10
diff --git a/windows/plan/organizational-tasks-for-each-report-type.md b/windows/plan/organizational-tasks-for-each-report-type.md
index 80b11d950a..dc649842a8 100644
--- a/windows/plan/organizational-tasks-for-each-report-type.md
+++ b/windows/plan/organizational-tasks-for-each-report-type.md
@@ -1,7 +1,6 @@
 ---
 title: Organizational Tasks for Each Report Type (Windows 10)
 description: The following table shows which tasks can be performed for each report type.
-MSHAttr: PreferredLib /library
 ms.assetid: 7463fab1-ba6e-4a9a-9112-0b69a18fe353
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/organizing-your-compatibility-data.md b/windows/plan/organizing-your-compatibility-data.md
index 76ad6b2a58..15d1d152b6 100644
--- a/windows/plan/organizing-your-compatibility-data.md
+++ b/windows/plan/organizing-your-compatibility-data.md
@@ -1,7 +1,6 @@
 ---
 title: Organizing Your Compatibility Data (Windows 10)
-description: This section provides step by step instructions for organizing your compatibility data in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
+description: This section provides step-by-step instructions for organizing your compatibility data in Application Compatibility Manager (ACM).
 ms.assetid: e91ae444-5d85-4b5f-b655-a765ecc78b1e
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/placeholder.md b/windows/plan/placeholder.md
deleted file mode 100644
index 05ef632ece..0000000000
--- a/windows/plan/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-#Placeholder content
\ No newline at end of file
diff --git a/windows/plan/prepare-your-organization-for-windows-to-go.md b/windows/plan/prepare-your-organization-for-windows-to-go.md
index 3f618977e2..cf0638b73a 100644
--- a/windows/plan/prepare-your-organization-for-windows-to-go.md
+++ b/windows/plan/prepare-your-organization-for-windows-to-go.md
@@ -1,9 +1,8 @@
 ---
 title: Prepare your organization for Windows To Go (Windows 10)
 description: Prepare your organization for Windows To Go
-MSHAttr: PreferredLib /library
 ms.assetid: f3f3c160-90ad-40a8-aeba-2aedee18f7ff
-keywords: ["mobile device USB deploy"]
+keywords: ["mobile, device, USB, deploy"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,18 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [What is Windows To Go?](#what-is-windows-to-go-)
--   [Usage scenarios](#usage-scenarios)
--   [Infrastructure considerations](#infrastructure-considerations)
--   [Activation considerations](#activation-considerations)
--   [Organizational unit structure and use of Group Policy Objects](#organizational-unit-structure-and-use-of-group-policy-objects)
--   [Computer account management](#computer-account-management)
--   [User account and data management](#user-account-and-data-management)
--   [Remote connectivity](#remote-connectivity)
--   [Related topics](#related-topics)
-
 The following information is provided to help you plan and design a new deployment of a Windows To Go in your production environment. It provides answers to the “what”, “why”, and “when” questions an IT professional might have when planning to deploy Windows To Go.
 
 ## What is Windows To Go?
diff --git a/windows/plan/prioritizing-your-compatibility-data.md b/windows/plan/prioritizing-your-compatibility-data.md
index 67ca4f440f..b597b63fc8 100644
--- a/windows/plan/prioritizing-your-compatibility-data.md
+++ b/windows/plan/prioritizing-your-compatibility-data.md
@@ -1,6 +1,5 @@
 ---
 title: Prioritizing Your Compatibility Data (Windows 10)
-MSHAttr: PreferredLib /library
 ms.assetid: 103e125a-bd2b-4019-9d6a-2e1d50c380b1
 description: 
 ms.prod: W10
diff --git a/windows/plan/ratings-icons-in-acm.md b/windows/plan/ratings-icons-in-acm.md
index d4bb51dc52..ab8a3a47ec 100644
--- a/windows/plan/ratings-icons-in-acm.md
+++ b/windows/plan/ratings-icons-in-acm.md
@@ -1,7 +1,6 @@
 ---
 title: Ratings Icons in ACM (Windows 10)
-description: Compatibility ratings can originate from Microsoft the application vendor your organization and from the Application Compatibility Toolkit (ACT) community.
-MSHAttr: PreferredLib /library
+description: Compatibility ratings can originate from Microsoft, the application vendor, your organization, and from the Application Compatibility Toolkit (ACT) community.
 ms.assetid: 0165499e-cb47-4d76-98a6-b871d23e4e83
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/resolving-an-issue.md b/windows/plan/resolving-an-issue.md
index b857fdc40d..74ffe1f620 100644
--- a/windows/plan/resolving-an-issue.md
+++ b/windows/plan/resolving-an-issue.md
@@ -1,7 +1,6 @@
 ---
 title: Resolving an Issue (Windows 10)
 description: You can use Application Compatibility Manager (ACM) to flag issues as resolved. Resolving an issue changes the status of the issue from a red x to a green check mark on your report and report detail screens.
-MSHAttr: PreferredLib /library
 ms.assetid: 96195122-185d-4f6a-8e84-79c3d069e933
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/saving-opening-and-exporting-reports.md b/windows/plan/saving-opening-and-exporting-reports.md
index 7f214617a6..2f947a935e 100644
--- a/windows/plan/saving-opening-and-exporting-reports.md
+++ b/windows/plan/saving-opening-and-exporting-reports.md
@@ -1,7 +1,6 @@
 ---
-title: Saving Opening and Exporting Reports (Windows 10)
-description: You can perform several common reporting tasks from the Analyze screen including saving a compatibility report opening a saved compatibility report (.adq) file and exporting your report data to a spreadsheet (.xls) file.
-MSHAttr: PreferredLib /library
+title: Saving, Opening, and Exporting Reports (Windows 10)
+description: You can perform several common reporting tasks from the Analyze screen, including saving a compatibility report, opening a saved compatibility report (.adq) file, and exporting your report data to a spreadsheet (.xls) file.
 ms.assetid: 8be72a6c-63ab-4451-ad79-815e2ac18aa2
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md b/windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md
index 89f18dba2e..6c83a990ee 100644
--- a/windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md
+++ b/windows/plan/searching-for-fixed-applications-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Searching for Fixed Applications in Compatibility Administrator (Windows 10)
-description: With the search functionality in Compatibility Administrator you can locate specific executable (.exe) files with previously applied compatibility fixes compatibility modes or AppHelp messages.
-MSHAttr: PreferredLib /library
+description: With the search functionality in Compatibility Administrator, you can locate specific executable (.exe) files with previously applied compatibility fixes, compatibility modes, or AppHelp messages.
 ms.assetid: 1051a2dc-0362-43a4-8ae8-07dae39b1cb8
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md b/windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
index f76cab4fea..bdc0043f6b 100644
--- a/windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
+++ b/windows/plan/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Searching for Installed Compatibility Fixes with the Query Tool in Compatibility Administrator (Windows 10)
 description: You can access the Query tool from within Compatibility Administrator. The Query tool provides the same functionality as using the Search feature.
-MSHAttr: PreferredLib /library
 ms.assetid: dd213b55-c71c-407a-ad49-33db54f82f22
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,15 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Querying by Using the Program Properties Tab](#querying-by-using-the-program-properties-tab)
--   [Querying by Using the Fix Properties Tab](#querying-by-using-the-fix-properties-tab)
--   [Querying by Using the Fix Description Tab](#querying-by-using-the-fix-description-tab)
--   [Querying by Using the Fix Description Tab](#querying-by-using-the-fix-description-tab)
--   [Exporting Your Search Results](#exporting-your-search-results)
--   [Related topics](#related-topics)
-
 You can access the Query tool from within Compatibility Administrator. The Query tool provides the same functionality as using the Search feature.
 
 For information about the Search feature, see [Searching for Fixed Applications in Compatibility Administrator](searching-for-fixed-applications-in-compatibility-administrator.md). However, the Query tool provides more detailed search criteria, including tabs that enable you to search the program properties, the compatibility fix properties, and the fix description. You can perform a search by using SQL SELECT and WHERE clauses, in addition to searching specific types of databases.
diff --git a/windows/plan/security-and-data-protection-considerations-for-windows-to-go.md b/windows/plan/security-and-data-protection-considerations-for-windows-to-go.md
index b7a4dadefb..5b2b71a83a 100644
--- a/windows/plan/security-and-data-protection-considerations-for-windows-to-go.md
+++ b/windows/plan/security-and-data-protection-considerations-for-windows-to-go.md
@@ -1,9 +1,8 @@
 ---
 title: Security and data protection considerations for Windows To Go (Windows 10)
-description: One of the most important requirements to consider when you plan your Windows To Go deployment is to ensure that the data content and resources you work with in the Windows To Go workspace is protected and secure.
-MSHAttr: PreferredLib /library
+description: One of the most important requirements to consider when you plan your Windows To Go deployment is to ensure that the data, content, and resources you work with in the Windows To Go workspace is protected and secure.
 ms.assetid: 5f27339f-6761-44f4-8c29-9a25cf8e75fe
-keywords: ["mobile device USB secure BitLocker"]
+keywords: ["mobile, device, USB, secure, BitLocker"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
@@ -17,14 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Backup and restore](#backup-and-restore)
--   [BitLocker](#bitlocker)
--   [Disk discovery and data leakage](#disk-discovery-and-data-leakage)
--   [Security certifications for Windows To Go](#security-certifications-for-windows-to-go)
--   [Related topics](#related-topics)
-
 One of the most important requirements to consider when you plan your Windows To Go deployment is to ensure that the data, content, and resources you work with in the Windows To Go workspace is protected and secure.
 
 ## Backup and restore
diff --git a/windows/plan/selecting-the-send-and-receive-status-for-an-application.md b/windows/plan/selecting-the-send-and-receive-status-for-an-application.md
index a0c55a0726..0a8f1c3450 100644
--- a/windows/plan/selecting-the-send-and-receive-status-for-an-application.md
+++ b/windows/plan/selecting-the-send-and-receive-status-for-an-application.md
@@ -1,7 +1,6 @@
 ---
 title: Selecting the Send and Receive Status for an Application (Windows 10)
-description: For each application listed in Application Compatibility Manager (ACM) you can select whether to send and receive specific application data through the Microsoft Compatibility Exchange.
-MSHAttr: PreferredLib /library
+description: For each application listed in Application Compatibility Manager (ACM), you can select whether to send and receive specific application data through the Microsoft Compatibility Exchange.
 ms.assetid: ae139093-27cf-4ad8-882d-e0509e78d33a
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/selecting-your-compatibility-rating.md b/windows/plan/selecting-your-compatibility-rating.md
index ee2dd12319..3b64974c1d 100644
--- a/windows/plan/selecting-your-compatibility-rating.md
+++ b/windows/plan/selecting-your-compatibility-rating.md
@@ -1,7 +1,6 @@
 ---
 title: Selecting Your Compatibility Rating (Windows 10)
-description: You can rate the compatibility of your applications installation packages or websites based on whether they run successfully on a 32 bit or 64 bit operating system.
-MSHAttr: PreferredLib /library
+description: You can rate the compatibility of your applications, installation packages, or websites, based on whether they run successfully on a 32-bit or 64-bit operating system.
 ms.assetid: 959da499-8fd6-4f32-8771-a0580dd8e0d3
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/selecting-your-deployment-status.md b/windows/plan/selecting-your-deployment-status.md
index 4eb2240be5..4d47ec35fb 100644
--- a/windows/plan/selecting-your-deployment-status.md
+++ b/windows/plan/selecting-your-deployment-status.md
@@ -1,7 +1,6 @@
 ---
 title: Selecting Your Deployment Status (Windows 10)
-description: In Application Compatibility Manager (ACM) you can track the deployment status of your applications and websites.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), you can track the deployment status of your applications and websites.
 ms.assetid: 7735d256-77eb-4498-93aa-c838ee6e00fc
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/sending-and-receiving-compatibility-data.md b/windows/plan/sending-and-receiving-compatibility-data.md
index 0085e66dfb..1a72d34bbe 100644
--- a/windows/plan/sending-and-receiving-compatibility-data.md
+++ b/windows/plan/sending-and-receiving-compatibility-data.md
@@ -1,7 +1,6 @@
 ---
 title: Sending and Receiving Compatibility Data (Windows 10)
-description: The Microsoft® Compatibility Exchange is a web service that propagates application compatibility issues between various data sources for example Microsoft Corporation independent software vendors (ISVs) and the ACT Community.
-MSHAttr: PreferredLib /library
+description: The Microsoft® Compatibility Exchange is a web service that propagates application compatibility issues between various data sources, for example Microsoft Corporation, independent software vendors (ISVs) and the ACT Community.
 ms.assetid: b86d2431-1caa-4f95-baf9-52ff6af546cd
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/settings-dialog-box---preferences-tab.md b/windows/plan/settings-dialog-box---preferences-tab.md
index 1b767fe1bc..faf33d73e4 100644
--- a/windows/plan/settings-dialog-box---preferences-tab.md
+++ b/windows/plan/settings-dialog-box---preferences-tab.md
@@ -1,7 +1,6 @@
 ---
-title: Settings Dialog Box Preferences Tab (Windows 10)
-description: To display the Settings dialog box in Application Compatibility Manager (ACM) on the Tools menu click Settings.
-MSHAttr: PreferredLib /library
+title: Settings Dialog Box - Preferences Tab (Windows 10)
+description: To display the Settings dialog box, in Application Compatibility Manager (ACM), on the Tools menu, click Settings.
 ms.assetid: deae2100-4110-4d72-b5ee-7c167f80bfa4
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/settings-dialog-box---settings-tab.md b/windows/plan/settings-dialog-box---settings-tab.md
index ccbdef6951..28bde93086 100644
--- a/windows/plan/settings-dialog-box---settings-tab.md
+++ b/windows/plan/settings-dialog-box---settings-tab.md
@@ -1,7 +1,6 @@
 ---
-title: Settings Dialog Box Settings Tab (Windows 10)
-description: To display the Settings dialog box in Application Compatibility Manager (ACM) on the Tools menu click Settings.
-MSHAttr: PreferredLib /library
+title: Settings Dialog Box - Settings Tab (Windows 10)
+description: To display the Settings dialog box, in Application Compatibility Manager (ACM), on the Tools menu, click Settings.
 ms.assetid: aeec1647-cf91-4f8b-9f6d-dbf4b898d901
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/settings-for-acm.md b/windows/plan/settings-for-acm.md
index e3c516e36a..fa9396220a 100644
--- a/windows/plan/settings-for-acm.md
+++ b/windows/plan/settings-for-acm.md
@@ -1,7 +1,6 @@
 ---
 title: Settings for ACM (Windows 10)
 description: This section provides information about settings that you can configure in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
 ms.assetid: e0126284-4348-4708-8976-a1e404f35971
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/setup-and-deployment.md b/windows/plan/setup-and-deployment.md
index a6900a1fad..f52da706cb 100644
--- a/windows/plan/setup-and-deployment.md
+++ b/windows/plan/setup-and-deployment.md
@@ -1,7 +1,6 @@
 ---
 title: Setup and deployment (Windows 10)
 description: This article describes the basic features of a Windows Update for Business deployment.
-MSHAttr: PreferredLib /library
 ms.assetid: E176BB36-3B1B-4707-9665-968D80050DD1
 keywords: ["update", "upgrade", "deployment"]
 ms.prod: w10
@@ -17,16 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Configure your systems to receive updates on CBB](#configure-your-systems-to-receive-updates-on-cbb)
--   [Defer OS upgrade and update deployments](#defer-os-upgrade)
--   [Pause upgrades and updates](#pause-upgrades-and-updates)
--   [Create validation groups for deployments](#create-validation-groups-for-deployments)
--   [Peer-to-peer networking for deployments](#peer-to-peer-networking-for-deployments-)
--   [Use Group Policy to configure Windows Update Delivery Optimization](#use-group-policy-to-configure-windows-update-delivery-optimization-)
--   [Related topics](#related-topics)
-
 This article describes the basic features of a Windows Update for Business deployment. Use this information to familiarize yourself with a simple deployment with a single group of machines connected to Windows Update, in addition to more complex scenarios such as the creation of Windows Update for Business validation groups that receive updates from Windows Update at different time intervals, as well as Windows Update for Business deployments integrated with existing management tools such as Windows Server Update Services (WSUS), System Center Configuration Manager, or Microsoft Intune.
 
 ## Configure your systems to receive updates on CBB
diff --git a/windows/plan/showing-messages-generated-by-the-sua-tool.md b/windows/plan/showing-messages-generated-by-the-sua-tool.md
index 1744e01f0d..1b34533117 100644
--- a/windows/plan/showing-messages-generated-by-the-sua-tool.md
+++ b/windows/plan/showing-messages-generated-by-the-sua-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Showing Messages Generated by the SUA Tool (Windows 10)
-description: On the user interface for the Standard User Analyzer (SUA) tool you can show the messages that the tool has generated.
-MSHAttr: PreferredLib /library
+description: On the user interface for the Standard User Analyzer (SUA) tool, you can show the messages that the tool has generated.
 ms.assetid: 767eb7f2-d6c4-414c-a7b3-a997337d904a
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/software-requirements-for-act.md b/windows/plan/software-requirements-for-act.md
index 68ea433158..5b3047ffaf 100644
--- a/windows/plan/software-requirements-for-act.md
+++ b/windows/plan/software-requirements-for-act.md
@@ -1,7 +1,6 @@
 ---
 title: Software Requirements for ACT (Windows 10)
 description: The Application Compatibility Toolkit (ACT) has the following software requirements.
-MSHAttr: PreferredLib /library
 ms.assetid: 9bbc21d4-f2ac-4a91-8add-017b1eacdeee
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/software-requirements-for-rap.md b/windows/plan/software-requirements-for-rap.md
index 55b4f65bd2..18462f9bd7 100644
--- a/windows/plan/software-requirements-for-rap.md
+++ b/windows/plan/software-requirements-for-rap.md
@@ -1,7 +1,6 @@
 ---
 title: Software Requirements for RAP (Windows 10)
-description: The runtime analysis package (RAP) has the following software requirements.
-MSHAttr: PreferredLib /library
+description: The runtime-analysis package (RAP) has the following software requirements.
 ms.assetid: 0163ce70-f5ba-400c-bdd5-a25511aac91f
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/sua-users-guide.md b/windows/plan/sua-users-guide.md
index bd038d09a1..d907f4229d 100644
--- a/windows/plan/sua-users-guide.md
+++ b/windows/plan/sua-users-guide.md
@@ -1,7 +1,6 @@
 ---
 title: SUA User's Guide (Windows 10)
 description: You can use Standard User Analyzer (SUA) to test your applications and monitor API calls to detect compatibility issues related to the User Account Control (UAC) feature in Windows.
-MSHAttr: PreferredLib /library
 ms.assetid: ea525c25-b557-4ed4-b042-3e4d0e543e10
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/tabs-on-the-sua-tool-interface.md b/windows/plan/tabs-on-the-sua-tool-interface.md
index ea03c1aad9..70a9ac7535 100644
--- a/windows/plan/tabs-on-the-sua-tool-interface.md
+++ b/windows/plan/tabs-on-the-sua-tool-interface.md
@@ -1,7 +1,6 @@
 ---
 title: Tabs on the SUA Tool Interface (Windows 10)
 description: The tabs in the Standard User Analyzer (SUA) tool show the User Account Control (UAC) issues for the applications that you analyze.
-MSHAttr: PreferredLib /library
 ms.assetid: 0d705321-1d85-4217-bf2c-0ca231ca303b
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/taking-inventory-of-your-organization.md b/windows/plan/taking-inventory-of-your-organization.md
index f5e814fe7f..d42fc430b2 100644
--- a/windows/plan/taking-inventory-of-your-organization.md
+++ b/windows/plan/taking-inventory-of-your-organization.md
@@ -1,7 +1,6 @@
 ---
 title: Taking Inventory of Your Organization (Windows 10)
 description: This section provides information about how to use the Application Compatibility Toolkit (ACT) to identify applications and devices that are installed in your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: d52f138d-c6b2-4ab1-bb38-5b036311a51d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/testing-compatibility-on-the-target-platform.md b/windows/plan/testing-compatibility-on-the-target-platform.md
index fbd6f96006..10111af439 100644
--- a/windows/plan/testing-compatibility-on-the-target-platform.md
+++ b/windows/plan/testing-compatibility-on-the-target-platform.md
@@ -1,7 +1,6 @@
 ---
 title: Testing Compatibility on the Target Platform (Windows 10)
-description: This section provides information about setting up a test environment for compatibility testing and about creating and deploying runtime analysis packages to the test environment.
-MSHAttr: PreferredLib /library
+description: This section provides information about setting up a test environment for compatibility testing, and about creating and deploying runtime-analysis packages to the test environment.
 ms.assetid: 8f3e9d58-37c2-41ea-a216-32712baf6cf4
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/testing-your-application-mitigation-packages.md b/windows/plan/testing-your-application-mitigation-packages.md
index 173aca62f9..df727951fd 100644
--- a/windows/plan/testing-your-application-mitigation-packages.md
+++ b/windows/plan/testing-your-application-mitigation-packages.md
@@ -1,7 +1,6 @@
 ---
 title: Testing Your Application Mitigation Packages (Windows 10)
-description: This topic provides details about testing your application mitigation packages including recommendations about how to report your information and how to resolve any outstanding issues.
-MSHAttr: PreferredLib /library
+description: This topic provides details about testing your application-mitigation packages, including recommendations about how to report your information and how to resolve any outstanding issues.
 ms.assetid: ae946f27-d377-4db9-b179-e8875d454ccf
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/toolbar-icons-in-acm-win-8.md b/windows/plan/toolbar-icons-in-acm-win-8.md
index 8449c8aa04..1620557d16 100644
--- a/windows/plan/toolbar-icons-in-acm-win-8.md
+++ b/windows/plan/toolbar-icons-in-acm-win-8.md
@@ -1,7 +1,6 @@
 ---
 title: Toolbar Icons in ACM (Windows 10)
 description: The following table shows icons that appear on toolbars and navigational elements in Application Compatibility Manager (ACM).
-MSHAttr: PreferredLib /library
 ms.assetid: 44872da1-c7ad-41b9-8323-d3c3f49b2706
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/troubleshooting-act-database-issues.md b/windows/plan/troubleshooting-act-database-issues.md
index 523e42737f..758df1a050 100644
--- a/windows/plan/troubleshooting-act-database-issues.md
+++ b/windows/plan/troubleshooting-act-database-issues.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshooting ACT Database Issues (Windows 10)
 description: The following solutions may help you resolve issues that are related to your Microsoft® SQL Server® database for the Application Compatibility Toolkit (ACT).
-MSHAttr: PreferredLib /library
 ms.assetid: c36ab5d8-cc82-4681-808d-3d491551b75e
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,14 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Connecting to a SQL Server Database](#connecting-to-a-sql-server-database)
--   [Verifying SQL Server Version](#verifying-sql-server-version)
--   [Creating an ACT Database](#creating-an-act-database)
--   [Granting ACT Database Permissions for the ACT Log Processing Service](#granting-act-database-permissions-for-the-act-log-processing-service)
--   [Related topics](#related-topics)
-
 The following solutions may help you resolve issues that are related to your Microsoft® SQL Server® database for the Application Compatibility Toolkit (ACT).
 
 For information about how to set up the database, see [ACT Database Configuration](act-database-configuration.md).
diff --git a/windows/plan/troubleshooting-act.md b/windows/plan/troubleshooting-act.md
index 1188fae2de..1dbfeee130 100644
--- a/windows/plan/troubleshooting-act.md
+++ b/windows/plan/troubleshooting-act.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshooting ACT (Windows 10)
 description: This section provides troubleshooting information for the Application Compatibility Toolkit (ACT).
-MSHAttr: PreferredLib /library
 ms.assetid: 5696b0c0-5db5-4111-a1e1-825129e683d8
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/troubleshooting-the-act-configuration-wizard.md b/windows/plan/troubleshooting-the-act-configuration-wizard.md
index afc47fc63d..058b39db72 100644
--- a/windows/plan/troubleshooting-the-act-configuration-wizard.md
+++ b/windows/plan/troubleshooting-the-act-configuration-wizard.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshooting the ACT Configuration Wizard (Windows 10)
-description: When you start Application Compatibility Manager (ACM) for the first time the Application Compatibility Toolkit (ACT) Configuration Wizard appears.
-MSHAttr: PreferredLib /library
+description: When you start Application Compatibility Manager (ACM) for the first time, the Application Compatibility Toolkit (ACT) Configuration Wizard appears.
 ms.assetid: f4f489c7-50b7-4b07-8b03-79777e1aaefd
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/troubleshooting-the-act-log-processing-service.md b/windows/plan/troubleshooting-the-act-log-processing-service.md
index 2d403bad15..8fef3bc4b5 100644
--- a/windows/plan/troubleshooting-the-act-log-processing-service.md
+++ b/windows/plan/troubleshooting-the-act-log-processing-service.md
@@ -1,7 +1,6 @@
 ---
 title: Troubleshooting the ACT Log Processing Service (Windows 10)
 description: The following solutions may help you resolve issues that are related to the Application Compatibility Toolkit (ACT) Log Processing Service.
-MSHAttr: PreferredLib /library
 ms.assetid: cb6f90c2-9f7d-4a34-a91e-8ed55b8c256d
 ms.prod: W10
 ms.mktglfcycl: operate
@@ -21,15 +20,6 @@ author: TrudyHa
 -   Windows Server 2012
 -   Windows Server 2008 R2
 
-**In this article**
-
--   [Reviewing Files in ACT Log File Format](#reviewing-files-in-act-log-file-format)
--   [Uploading Files to the ACT Log Processing Service Share After Setting Permissions](#uploading-files-to-the-act-log-processing-service-share-after-setting-permissions)
--   [Working Around Windows Firewall on the Computer That Hosts the ACT Log Processing Service Share](#working-around-windows-firewall-on-the-computer-that-hosts-the-act-log-processing-service-share)
--   [Viewing and Assigning "Log on as a service" Permissions](#viewing-and-assigning--log-on-as-a-service--permissions)
--   [Starting the ACT Log Processing Service](#starting-the-act-log-processing-service)
--   [Related topics](#related-topics)
-
 The following solutions may help you resolve issues that are related to the Application Compatibility Toolkit (ACT) Log Processing Service.
 
 For information about how to set up permissions for the service, see [ACT LPS Share Permissions](act-lps-share-permissions.md).
diff --git a/windows/plan/understanding-and-using-compatibility-fixes.md b/windows/plan/understanding-and-using-compatibility-fixes.md
index bc6ac2b227..bde6db5bc2 100644
--- a/windows/plan/understanding-and-using-compatibility-fixes.md
+++ b/windows/plan/understanding-and-using-compatibility-fixes.md
@@ -1,7 +1,6 @@
 ---
 title: Understanding and Using Compatibility Fixes (Windows 10)
-description: As the Windows operating system evolves to support new technology and functionality the implementations of some functions may change.
-MSHAttr: PreferredLib /library
+description: As the Windows operating system evolves to support new technology and functionality, the implementations of some functions may change.
 ms.assetid: 84bf663d-3e0b-4168-99d6-a26e054821b7
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-act.md b/windows/plan/using-act.md
index 18f64e0e18..a091159a76 100644
--- a/windows/plan/using-act.md
+++ b/windows/plan/using-act.md
@@ -1,7 +1,6 @@
 ---
 title: Using ACT (Windows 10)
 description: This section describes how to use the Application Compatibility Toolkit (ACT) in your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: e6a68f44-7503-450d-a000-a04fbb93a146
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-compatibility-monitor-to-send-feedback.md b/windows/plan/using-compatibility-monitor-to-send-feedback.md
index d5032c9220..4bf3abf7e8 100644
--- a/windows/plan/using-compatibility-monitor-to-send-feedback.md
+++ b/windows/plan/using-compatibility-monitor-to-send-feedback.md
@@ -1,7 +1,6 @@
 ---
 title: Using Compatibility Monitor to Send Feedback (Windows 10)
-description: The Microsoft Compatibility Monitor tool is installed as part of the runtime analysis package.
-MSHAttr: PreferredLib /library
+description: The Microsoft Compatibility Monitor tool is installed as part of the runtime-analysis package.
 ms.assetid: dc59193e-7ff4-4950-8c20-e90c246e469d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-the-compatibility-administrator-tool.md b/windows/plan/using-the-compatibility-administrator-tool.md
index 4a6df7bf85..09f3b30d05 100644
--- a/windows/plan/using-the-compatibility-administrator-tool.md
+++ b/windows/plan/using-the-compatibility-administrator-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Using the Compatibility Administrator Tool (Windows 10)
 description: This section provides information about using the Compatibility Administrator tool.
-MSHAttr: PreferredLib /library
 ms.assetid: 57271e47-b9b9-4018-a0b5-7115a533166d
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-the-sdbinstexe-command-line-tool.md b/windows/plan/using-the-sdbinstexe-command-line-tool.md
index 9ff0bb248f..26fdc888d1 100644
--- a/windows/plan/using-the-sdbinstexe-command-line-tool.md
+++ b/windows/plan/using-the-sdbinstexe-command-line-tool.md
@@ -1,7 +1,6 @@
 ---
-title: Using the Sdbinst.exe Command Line Tool (Windows 10)
-description: You must deploy your customized database (.sdb) files to other computers in your organization before your compatibility fixes compatibility modes and AppHelp messages are applied.
-MSHAttr: PreferredLib /library
+title: Using the Sdbinst.exe Command-Line Tool (Windows 10)
+description: You must deploy your customized database (.sdb) files to other computers in your organization before your compatibility fixes, compatibility modes, and AppHelp messages are applied.
 ms.assetid: c1945425-3f8d-4de8-9d2d-59f801f07034
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-the-sua-tool.md b/windows/plan/using-the-sua-tool.md
index ec9cb57c3f..978389cd95 100644
--- a/windows/plan/using-the-sua-tool.md
+++ b/windows/plan/using-the-sua-tool.md
@@ -1,7 +1,6 @@
 ---
 title: Using the SUA Tool (Windows 10)
-description: By using the Standard User Analyzer (SUA) tool you can test your applications and monitor API calls to detect compatibility issues with the User Account Control (UAC) feature.
-MSHAttr: PreferredLib /library
+description: By using the Standard User Analyzer (SUA) tool, you can test your applications and monitor API calls to detect compatibility issues with the User Account Control (UAC) feature.
 ms.assetid: ebe52061-3816-47f7-a865-07bc5f405f03
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/using-the-sua-wizard.md b/windows/plan/using-the-sua-wizard.md
index 8f48f86643..7571be582c 100644
--- a/windows/plan/using-the-sua-wizard.md
+++ b/windows/plan/using-the-sua-wizard.md
@@ -1,7 +1,6 @@
 ---
 title: Using the SUA Wizard (Windows 10)
-description: The Standard User Analyzer (SUA) Wizard works much like the SUA tool to evaluate User Account Control (UAC) issues. However the SUA Wizard does not offer detailed analysis and it cannot disable virtualization or elevate your permissions.
-MSHAttr: PreferredLib /library
+description: The Standard User Analyzer (SUA) Wizard works much like the SUA tool to evaluate User Account Control (UAC) issues. However, the SUA Wizard does not offer detailed analysis, and it cannot disable virtualization or elevate your permissions.
 ms.assetid: 29d07074-3de7-4ace-9a54-678af7255d6c
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/viewing-the-events-screen-in-compatibility-administrator.md b/windows/plan/viewing-the-events-screen-in-compatibility-administrator.md
index aefdf94e64..29d76d517d 100644
--- a/windows/plan/viewing-the-events-screen-in-compatibility-administrator.md
+++ b/windows/plan/viewing-the-events-screen-in-compatibility-administrator.md
@@ -1,7 +1,6 @@
 ---
 title: Viewing the Events Screen in Compatibility Administrator (Windows 10)
-description: The Events screen enables you to record and to view your activities in the Compatibility Administrator tool provided that the screen is open while you perform the activities.
-MSHAttr: PreferredLib /library
+description: The Events screen enables you to record and to view your activities in the Compatibility Administrator tool, provided that the screen is open while you perform the activities.
 ms.assetid: f2b2ada4-1b7b-4558-989d-5b52b40454b3
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/viewing-your-compatibility-reports.md b/windows/plan/viewing-your-compatibility-reports.md
index 9745ff6008..6f347c8ca5 100644
--- a/windows/plan/viewing-your-compatibility-reports.md
+++ b/windows/plan/viewing-your-compatibility-reports.md
@@ -1,7 +1,6 @@
 ---
 title: Viewing Your Compatibility Reports (Windows 10)
 description: This section describes the compatibility reports in Application Compatibility Manager (ACM) and how you can work with the reports.
-MSHAttr: PreferredLib /library
 ms.assetid: a28bbfbe-5f05-4a1e-9397-0a3ceb585871
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/websiteurl-dialog-box.md b/windows/plan/websiteurl-dialog-box.md
index 1522ce686a..10f108276b 100644
--- a/windows/plan/websiteurl-dialog-box.md
+++ b/windows/plan/websiteurl-dialog-box.md
@@ -1,7 +1,6 @@
 ---
 title: WebsiteURL Dialog Box (Windows 10)
-description: In Application Compatibility Manager (ACM) the websiteURL dialog box shows information about the selected website.
-MSHAttr: PreferredLib /library
+description: In Application Compatibility Manager (ACM), the websiteURL dialog box shows information about the selected website.
 ms.assetid: 0dad26e1-4bba-4fef-b160-3fa1f4325da8
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/welcome-to-act.md b/windows/plan/welcome-to-act.md
index 720b43088b..fdbbc6ad7d 100644
--- a/windows/plan/welcome-to-act.md
+++ b/windows/plan/welcome-to-act.md
@@ -1,7 +1,6 @@
 ---
 title: Welcome to ACT (Windows 10)
-description: The Application Compatibility Toolkit (ACT) helps you determine whether the applications devices and computers in your organization are compatible with versions of the Windows® operating system.
-MSHAttr: PreferredLib /library
+description: The Application Compatibility Toolkit (ACT) helps you determine whether the applications, devices, and computers in your organization are compatible with versions of the Windows® operating system.
 ms.assetid: 3963db88-83d2-4b9a-872e-31c275d1a321
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/whats-new-in-act-60.md b/windows/plan/whats-new-in-act-60.md
index dd296eb4b8..c765ca62eb 100644
--- a/windows/plan/whats-new-in-act-60.md
+++ b/windows/plan/whats-new-in-act-60.md
@@ -1,7 +1,6 @@
 ---
 title: What's New in ACT 6.1 (Windows 10)
 description: Two major updates have been released since ACT 6.1.
-MSHAttr: PreferredLib /library
 ms.assetid: f12e137d-0b55-4f7d-88e0-149302655d9b
 ms.prod: W10
 ms.mktglfcycl: operate
diff --git a/windows/plan/windows-10-compatibility.md b/windows/plan/windows-10-compatibility.md
index d4d2cc9315..0d588136e8 100644
--- a/windows/plan/windows-10-compatibility.md
+++ b/windows/plan/windows-10-compatibility.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 compatibility (Windows 10)
-description: Windows 10 will be compatible with most existing PC hardware; most devices running Windows 7 Windows 8 or Windows 8.1 will meet the requirements for Windows 10.
-MSHAttr: PreferredLib /library
+description: Windows 10 will be compatible with most existing PC hardware; most devices running Windows 7, Windows 8, or Windows 8.1 will meet the requirements for Windows 10.
 ms.assetid: 829BE5B5-330A-4702-807A-8908B4FC94E8
 keywords: ["deploy", "upgrade", "update", "appcompat"]
 ms.prod: W10
@@ -17,11 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Recommended application testing process](#recommended-application-testing-process)
--   [Related topics](#related-topics)
-
 Windows 10 will be compatible with most existing PC hardware; most devices running Windows 7, Windows 8, or Windows 8.1 will meet the requirements for Windows 10.
 
 For full system requirements, see [Windows 10 specifications](http://go.microsoft.com/fwlink/p/?LinkId=625077). Some driver updates may be required for Windows 10.
diff --git a/windows/plan/windows-10-deployment-considerations.md b/windows/plan/windows-10-deployment-considerations.md
index 3cf1824f26..cc72629422 100644
--- a/windows/plan/windows-10-deployment-considerations.md
+++ b/windows/plan/windows-10-deployment-considerations.md
@@ -1,9 +1,8 @@
 ---
 title: Windows 10 deployment considerations (Windows 10)
 description: There are new deployment options in Windows 10 that help you simplify the deployment process and automate migration of existing settings and applications.
-MSHAttr: PreferredLib /library
 ms.assetid: A8DD6B37-1E11-4CD6-B588-92C2404219FE
-keywords: ["deploy", "upgrade", "update", "in place"]
+keywords: ["deploy", "upgrade", "update", "in-place"]
 ms.prod: W10
 ms.mktglfcycl: plan
 ms.sitesec: library
@@ -17,13 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Migration from previous Windows versions](#migration-from-previous-windows-versions)
--   [Setup of new computers](#setup-of-new-computers)
--   [Stay up to date](#stay-up-to-date)
--   [Related topics](#related-topics)
-
 There are new deployment options in Windows 10 that help you simplify the deployment process and automate migration of existing settings and applications.
 
 For many years, organizations have deployed new versions of Windows using a “wipe and load” deployment process. At a high level, this process captures existing data and settings from the existing device, deploys a new custom-built Windows image to a PC, injects hardware drivers, reinstalls applications, and finally restores the data and settings. With Windows 10, this process is still fully supported, and for some deployment scenarios is still necessary.
diff --git a/windows/plan/windows-10-infrastructure-requirements.md b/windows/plan/windows-10-infrastructure-requirements.md
index 68e219371d..af899becf8 100644
--- a/windows/plan/windows-10-infrastructure-requirements.md
+++ b/windows/plan/windows-10-infrastructure-requirements.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 infrastructure requirements (Windows 10)
 description: There are specific infrastructure requirements to deploy and manage Windows 10 that should be in place prior to significant Windows 10 deployments within your organization.
-MSHAttr: PreferredLib /library
 ms.assetid: B0FA27D9-A206-4E35-9AE6-74E70748BE64
 keywords: ["deploy", "upgrade", "update", "hardware"]
 ms.prod: W10
@@ -17,14 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [High-level requirements](#high-level-requirements)
--   [Deployment tools](#deployment-tools)
--   [Management tools](#management-tools)
--   [Activation](#activation)
--   [Related topics](#related-topics)
-
 There are specific infrastructure requirements to deploy and manage Windows 10 that should be in place prior to significant Windows 10 deployments within your organization.
 
 ## High-level requirements
diff --git a/windows/plan/windows-10-servicing-model.md b/windows/plan/windows-10-servicing-model.md
index 2bd16634f5..1ed3b55f95 100644
--- a/windows/plan/windows-10-servicing-model.md
+++ b/windows/plan/windows-10-servicing-model.md
@@ -1,7 +1,6 @@
 ---
 title: Windows 10 servicing options (Windows 10)
 description: Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process.
-MSHAttr: PreferredLib /library
 ms.assetid: 6EF0792C-B587-497D-8489-4A7F5848D92A
 keywords: ["deploy", "upgrade", "update", "servicing"]
 ms.prod: W10
@@ -18,16 +17,6 @@ author: TrudyHa
 -   Windows 10
 -   Windows 10 Mobile
 
-**In this article**
-
--   [Key terminology](#key-terminology)
--   [Windows 10 branch overview](#windows-10-branch-overview)
--   [Current Branch versus Current Branch for Business](#current-branch-versus-current-branch-for-business)
--   [Long-Term Servicing Branch](#long-term-servicing-branch)
--   [Windows Insider Program](#windows-insider-program)
--   [Switching between branches](#switching-between-branches)
--   [Related topics](#related-topics)
-
 Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process.
 
 Traditionally, new versions of Windows have been released every few years. The deployment of those new versions within an organization would then become a project, either by leveraging a “wipe and load” process to deploy the new operating system version to existing machines, or by migrating to the new operating system version as part of the hardware replacement cycle. Either way, organizations would invest significant time and effort to complete the required tasks.
diff --git a/windows/plan/windows-to-go-feature-overview-scenario.md b/windows/plan/windows-to-go-feature-overview-scenario.md
index 53ccf35d71..a84b375c14 100644
--- a/windows/plan/windows-to-go-feature-overview-scenario.md
+++ b/windows/plan/windows-to-go-feature-overview-scenario.md
@@ -1,9 +1,8 @@
 ---
 title: Windows To Go feature overview (Windows 10)
-description: Windows To Go is a feature in Windows 10 Enterprise and Windows 10 Education that enables the creation of a Windows To Go workspace that can be booted from a USB connected external drive on PCs.
-MSHAttr: PreferredLib /library
+description: Windows To Go is a feature in Windows 10 Enterprise and Windows 10 Education that enables the creation of a Windows To Go workspace that can be booted from a USB-connected external drive on PCs.
 ms.assetid: 9df82b03-acba-442c-801d-56db241f8d42
-keywords: ["workspace mobile installation image USB device image"]
+keywords: ["workspace, mobile, installation, image, USB, device, image"]
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/plan/windows-to-go-frequently-asked-questions.md b/windows/plan/windows-to-go-frequently-asked-questions.md
index d79b0d9303..47da55d191 100644
--- a/windows/plan/windows-to-go-frequently-asked-questions.md
+++ b/windows/plan/windows-to-go-frequently-asked-questions.md
@@ -1,9 +1,8 @@
 ---
 title: Windows To Go frequently asked questions (Windows 10)
 description: Windows To Go frequently asked questions
-MSHAttr: PreferredLib /library
 ms.assetid: bfdfb824-4a19-4401-b369-22c5e6ca9d6e
-keywords: ["FAQ mobile device USB"]
+keywords: ["FAQ, mobile, device, USB"]
 ms.prod: W10
 ms.mktglfcycl: deploy
 ms.sitesec: library
diff --git a/windows/plan/windows-update-for-business.md b/windows/plan/windows-update-for-business.md
index 84c601125b..21bb74847f 100644
--- a/windows/plan/windows-update-for-business.md
+++ b/windows/plan/windows-update-for-business.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Update for Business (Windows 10)
 description: Get an overview of how you can implement and deploy a Windows Update for Business solution and how to maintain enrolled systems.
-MSHAttr: PreferredLib /library
 ms.assetid: DF61F8C9-A8A6-4E83-973C-8ABE090DB8C6
 keywords: ["update", "upgrade", "deployment", "WSUS"]
 ms.prod: w10
@@ -17,14 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [Introduction](#introduction)
--   [Deploy Windows Update for Business in your organization](#deploy-windows-update-for-business-in-your-organization)
--   [Eligible devices](#eligible-devices)
--   [OS upgrades and updates](#os-upgrades-and-updates)
--   [Related topics](#related-topics)
-
 Get an overview of how you can implement and deploy a Windows Update for Business solution and how to maintain enrolled systems.
 
 ## Introduction
diff --git a/windows/whats-new/TOC.md b/windows/whats-new/TOC.md
index c880033513..d1840fd5b8 100644
--- a/windows/whats-new/TOC.md
+++ b/windows/whats-new/TOC.md
@@ -7,9 +7,9 @@
 ## [Device Guard](device-guard-overview.md)
 ## [Enterprise data protection (EDP)](enterprise-data-protection-overview.md)
 ## [Enterprise management for Windows 10 devices](device-management.md)
-## [Lockdown features from Windows Embedded Industry 8.1](lockdown-features-from-windows-embedded-industry-8-1.md)
+## [Lockdown features from Windows Embedded Industry 8.1](lockdown-features-windows-10.md)
 ## [Microsoft Passport](microsoft-passport.md)
-## [Provisioning packages](provisioning-and-upgrade.md)
+## [Provisioning packages](new-provisioning-packages.md)
 ## [Security](security.md)
 ## [Security auditing](security-auditing.md)
 ## [Trusted Platform Module](trusted-platform-module.md)
diff --git a/windows/whats-new/applocker.md b/windows/whats-new/applocker.md
index bf67ea57bf..3e605c56f0 100644
--- a/windows/whats-new/applocker.md
+++ b/windows/whats-new/applocker.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in AppLocker (Windows 10)
-description: AppLocker helps you control which apps and files users can run. These include executable files scripts Windows Installer files dynamic link libraries (DLLs) packaged apps and packaged app installers.
-MSHAttr: PreferredLib /library
+description: AppLocker helps you control which apps and files users can run. These include executable files, scripts, Windows Installer files, dynamic-link libraries (DLLs), packaged apps, and packaged app installers.
 ms.assetid: 6F836FF6-7794-4E7B-89AA-1EABA1BF183F
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/bitlocker.md b/windows/whats-new/bitlocker.md
index dd4275f5d4..b88ada4195 100644
--- a/windows/whats-new/bitlocker.md
+++ b/windows/whats-new/bitlocker.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in BitLocker (Windows 10)
-description: BitLocker Drive Encryption is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost stolen or inappropriately decommissioned computers.
-MSHAttr: PreferredLib /library
+description: BitLocker Drive Encryption is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers.
 ms.assetid: 3F2DE365-68A1-4CDB-AB5F-C65574684C7B
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/business-store-for-windows-10.md b/windows/whats-new/business-store-for-windows-10.md
index 9a85b08079..f68e1e67af 100644
--- a/windows/whats-new/business-store-for-windows-10.md
+++ b/windows/whats-new/business-store-for-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Windows Store for Business overview (Windows 10)
-description: With the new Windows Store for Business organizations can make volume purchases of Windows apps.
-MSHAttr: PreferredLib /library
+description: With the new Windows Store for Business, organizations can make volume purchases of Windows apps.
 ms.assetid: 9DA71F6B-654D-4121-9A40-D473CC654A1C
 ms.prod: W10
 ms.mktglfcycl: manage
diff --git a/windows/whats-new/change-history-for-what-s-new-in-windows-10.md b/windows/whats-new/change-history-for-what-s-new-in-windows-10.md
index af8ba6cf38..d767164865 100644
--- a/windows/whats-new/change-history-for-what-s-new-in-windows-10.md
+++ b/windows/whats-new/change-history-for-what-s-new-in-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Change history for What's new in Windows 10 (Windows 10)
 description: This topic lists new and updated topics in the What's new in Windows 10 documentation for Windows 10 and Windows 10 Mobile.
-MSHAttr: PreferredLib /library
 ms.assetid: 75F285B0-09BE-4821-9B42-37B9BE54CEC6
 ms.prod: W10
 ms.mktglfcycl: deploy
@@ -30,7 +29,7 @@ This topic lists new and updated topics in the [What's new in Windows 10](index.
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left">[Lockdown features from Windows Embedded Industry 8.1](lockdown-features-from-windows-embedded-industry-8-1.md)</td>
+<td align="left">[Lockdown features from Windows Embedded Industry 8.1](lockdown-features-windows-10.md)</td>
 <td align="left"><p>Updated to include policy setting names for USB filter and Toast notification filter</p></td>
 </tr>
 </tbody>
@@ -81,7 +80,7 @@ This topic lists new and updated topics in the [What's new in Windows 10](index.
 | [BitLocker](bitlocker.md)                                                                                       | New         |
 | [Credential Guard](credential-guard.md)                                                                         | New         |
 | [Device Guard](device-guard-overview.md)                                                                        | New         |
-| [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-from-windows-embedded-industry-8-1.md) | New         |
+| [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md) | New         |
 | [Security auditing](security-auditing.md)                                                                       | New         |
 | [Trusted Platform Module](trusted-platform-module.md)                                                           | New         |
 | [Windows spotlight on the lock screen](windows-spotlight.md)                                                    | New         |
diff --git a/windows/whats-new/credential-guard.md b/windows/whats-new/credential-guard.md
index 7bb19c473c..84c8c04062 100644
--- a/windows/whats-new/credential-guard.md
+++ b/windows/whats-new/credential-guard.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in Credential Guard (Windows 10)
-description: Credential Guard uses virtualization based security to isolate secrets so that only privileged system software can access them.
-MSHAttr: PreferredLib /library
+description: Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them.
 ms.assetid: 59C206F7-2832-4555-97B4-3070D93CC3C5
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/device-guard-overview.md b/windows/whats-new/device-guard-overview.md
index 5bc73db26d..a6cb5dae84 100644
--- a/windows/whats-new/device-guard-overview.md
+++ b/windows/whats-new/device-guard-overview.md
@@ -1,7 +1,6 @@
 ---
 title: Device Guard overview (Windows 10)
-description: Device Guard is a combination of enterprise related hardware and software security features that when configured together will lock a device down so that it can only run trusted applications.
-MSHAttr: PreferredLib /library
+description: Device Guard is a combination of enterprise-related hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications.
 ms.assetid: FFE244EE-5804-4CE8-A2A9-48F49DC3AEF2
 keywords: ["Device Guard"]
 ms.prod: W10
@@ -135,7 +134,7 @@ This signing can happen by:
 
 -   **Using a non-Microsoft signing authority.** ISV's and enterprises can use a trusted non-Microsoft signing authority to sign all of their own Classic Windows applications.
 
--   **Using a Microsoft-provided web service (coming later this year).** ISV's and enterprises will be able to use a more secure, Microsoft-provided web service to sign their Classic Windows applications.
+-   **Use the Device Guard signing portal**. Available in the Windows Store for Business, you can use a Microsoft web service to sign your Classic Windows applications. For more info, see [Device Guard signing](../manage/device-guard-signing-portal.md).
 
 ### Code Integrity policy
 
diff --git a/windows/whats-new/device-management.md b/windows/whats-new/device-management.md
index 46da2433cc..97e1081acd 100644
--- a/windows/whats-new/device-management.md
+++ b/windows/whats-new/device-management.md
@@ -1,7 +1,6 @@
 ---
 title: Enterprise management for Windows 10 devices (Windows 10)
-description: Windows 10 provides mobile device management (MDM) capabilities for PCs laptops tablets and phones that enable enterprise level management of corporate owned and personal devices.
-MSHAttr: PreferredLib /library
+description: Windows 10 provides mobile device management (MDM) capabilities for PCs, laptops, tablets, and phones that enable enterprise-level management of corporate-owned and personal devices.
 ms.assetid: 36DA67A1-25F1-45AD-A36B-AEEAC30C9BC4
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/enterprise-data-protection-overview.md b/windows/whats-new/enterprise-data-protection-overview.md
index b9e3d8d887..d56f40ee4e 100644
--- a/windows/whats-new/enterprise-data-protection-overview.md
+++ b/windows/whats-new/enterprise-data-protection-overview.md
@@ -1,7 +1,6 @@
 ---
 title: Enterprise data protection (EDP) overview (Windows 10)
-description: With the increase of employee owned devices in the enterprise there’s also an increasing risk of accidental data disclosure through apps and services that are outside of the enterprise’s control like email social media and the public cloud.
-MSHAttr: PreferredLib /library
+description: With the increase of employee-owned devices in the enterprise, there’s also an increasing risk of accidental data disclosure through apps and services that are outside of the enterprise’s control like email, social media, and the public cloud.
 ms.assetid: 428A3135-CB5E-478B-B1FF-B6EB76F0DF14
 keywords: ["EDP Overview", "EDP"]
 ms.prod: W10
diff --git a/windows/whats-new/index.md b/windows/whats-new/index.md
index 8cb26e6eeb..6258942dfe 100644
--- a/windows/whats-new/index.md
+++ b/windows/whats-new/index.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in Windows 10 (Windows 10)
-description: Learn about new features in Windows 10 for IT professionals such as Enterprise Data Protection Microsoft Passport Device Guard and more.
-MSHAttr: PreferredLib /library
+description: Learn about new features in Windows 10 for IT professionals, such as Enterprise Data Protection, Microsoft Passport, Device Guard, and more.
 ms.assetid: F1867017-76A1-4761-A200-7450B96AEF44
 keywords: ["What's new in Windows 10", "Windows 10"]
 ms.prod: W10
@@ -61,7 +60,7 @@ Learn about new features in Windows 10 for IT professionals, such as Enterprise
 <td align="left"><p>Windows 10 provides mobile device management (MDM) capabilities for PCs, laptops, tablets, and phones that enable enterprise-level management of corporate-owned and personal devices.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Lockdown features from Windows Embedded Industry 8.1](lockdown-features-from-windows-embedded-industry-8-1.md)</p></td>
+<td align="left"><p>[Lockdown features from Windows Embedded Industry 8.1](lockdown-features-windows-10.md)</p></td>
 <td align="left"><p>Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. This table maps Windows Embedded Industry 8.1 features to Windows 10 Enterprise features, along with links to documentation.</p></td>
 </tr>
 <tr class="even">
@@ -69,7 +68,7 @@ Learn about new features in Windows 10 for IT professionals, such as Enterprise
 <td align="left"><p>In Windows 10, Microsoft Passport replaces passwords with strong two-factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>[Provisioning packages](provisioning-and-upgrade.md)</p></td>
+<td align="left"><p>[Provisioning packages](new-provisioning-packages.md)</p></td>
 <td align="left"><p>With Windows 10, you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image.</p></td>
 </tr>
 <tr class="even">
@@ -112,6 +111,11 @@ Learn about new features in Windows 10 for IT professionals, such as Enterprise
 
 [Compare Windows 10 Editions](http://go.microsoft.com/fwlink/p/?LinkId=690485)
 
+## Related topics
+
+
+[Windows 10 and Windows 10 Mobile](../index.md)
+
  
 
  
diff --git a/windows/whats-new/lockdown-features-from-windows-embedded-industry-8-1.md b/windows/whats-new/lockdown-features-windows-10.md
similarity index 98%
rename from windows/whats-new/lockdown-features-from-windows-embedded-industry-8-1.md
rename to windows/whats-new/lockdown-features-windows-10.md
index 3569e9ac88..460a0a1dde 100644
--- a/windows/whats-new/lockdown-features-from-windows-embedded-industry-8-1.md
+++ b/windows/whats-new/lockdown-features-windows-10.md
@@ -1,7 +1,6 @@
 ---
 title: Lockdown features from Windows Embedded 8.1 Industry (Windows 10)
-description: Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. This table maps Windows Embedded Industry 8.1 features to Windows 10 Enterprise features along with links to documentation.
-MSHAttr: PreferredLib /library
+description: Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. This table maps Windows Embedded Industry 8.1 features to Windows 10 Enterprise features, along with links to documentation.
 ms.assetid: 3C006B00-535C-4BA4-9421-B8F952D47A14
 keywords: ["lockdown", "embedded"]
 ms.prod: W10
diff --git a/windows/whats-new/microsoft-edge-and-internet-explorer-11.md b/windows/whats-new/microsoft-edge-and-internet-explorer-11.md
index 35d2804a0e..26965c7caa 100644
--- a/windows/whats-new/microsoft-edge-and-internet-explorer-11.md
+++ b/windows/whats-new/microsoft-edge-and-internet-explorer-11.md
@@ -1,7 +1,6 @@
 ---
 title: Browser Microsoft Edge and Internet Explorer 11 (Windows 10)
 description: Resources to help you explore the Windows 10 browsing options for your enterprise.
-MSHAttr: PreferredLib /library
 ms.assetid: E986F903-69AD-4145-9D24-0C6D04B3E489
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/microsoft-passport.md b/windows/whats-new/microsoft-passport.md
index 3b5ec0d625..e684f2be3b 100644
--- a/windows/whats-new/microsoft-passport.md
+++ b/windows/whats-new/microsoft-passport.md
@@ -1,7 +1,6 @@
 ---
 title: Microsoft Passport overview (Windows 10)
-description: In Windows 10 Microsoft Passport replaces passwords with strong two factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.
-MSHAttr: PreferredLib /library
+description: In Windows 10, Microsoft Passport replaces passwords with strong two-factor authentication that consists of an enrolled device and a Windows Hello (biometric) or PIN.
 ms.assetid: 292F3BE9-3651-4B20-B83F-85560631EF5B
 keywords: ["password", "hello", "fingerprint", "iris", "biometric"]
 ms.prod: W10
diff --git a/windows/whats-new/provisioning-and-upgrade.md b/windows/whats-new/new-provisioning-packages.md
similarity index 95%
rename from windows/whats-new/provisioning-and-upgrade.md
rename to windows/whats-new/new-provisioning-packages.md
index 51ed571729..676106047c 100644
--- a/windows/whats-new/provisioning-and-upgrade.md
+++ b/windows/whats-new/new-provisioning-packages.md
@@ -1,7 +1,6 @@
 ---
 title: Provisioning packages (Windows 10)
-description: With Windows 10 you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image.
-MSHAttr: PreferredLib /library
+description: With Windows 10, you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image.
 ms.assetid: 287706E5-063F-4AB5-902C-A0DF6D0730BC
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/placeholder.md b/windows/whats-new/placeholder.md
deleted file mode 100644
index 05ef632ece..0000000000
--- a/windows/whats-new/placeholder.md
+++ /dev/null
@@ -1 +0,0 @@
-#Placeholder content
\ No newline at end of file
diff --git a/windows/whats-new/security-auditing.md b/windows/whats-new/security-auditing.md
index 91c4a96a20..ee6ab69e6d 100644
--- a/windows/whats-new/security-auditing.md
+++ b/windows/whats-new/security-auditing.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in security auditing (Windows 10)
 description: Security auditing is one of the most powerful tools that you can use to maintain the integrity of your system.
-MSHAttr: PreferredLib /library
 ms.assetid: CB35A02E-5C66-449D-8C90-7B73C636F67B
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/security.md b/windows/whats-new/security.md
index ed6109c209..adbae76a18 100644
--- a/windows/whats-new/security.md
+++ b/windows/whats-new/security.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in Windows 10 security (Windows 10)
 description: There are several key client security improvements Microsoft has made in Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: 6B8A5F7A-ABD3-416C-87B0-85F68B214C81
 keywords: ["secure", "data loss prevention", "multifactor authentication"]
 ms.prod: W10
@@ -13,14 +12,6 @@ author: TrudyHa
 # What's new in Windows 10 security
 
 
-**In this article**
-
--   [Threat resistance](#threat-resistance)
--   [Information protection](#information-protection)
--   [Identity protection and access control](#identity-protection-and-access-control)
--   [Windows 10 hardware considerations](#hardware)
--   [Related topics](#related-topics)
-
 There are several key client security improvements Microsoft has made in Windows 10. These improvements focus on three key areas — threat resistance, information protection, and identity protection and access control. In addition to an overview of the features themselves, this article discusses the hardware requirements for each new feature and offers configuration recommendations and links to more detailed resources.
 
 Microsoft designed the Windows 10 operating system to be the most secure version of the Windows operating system to date. To achieve this goal, Windows 10 employs advanced and now widely available hardware features to help protect users and devices against modern cyber threats. With thousands of new malware variants discovered daily and malicious hacking techniques evolving rapidly, never before has Windows client security been more important. In Windows 10, organizations can deploy new threat-resistant security features that harden the operating system in ways that can benefit Bring Your Own Device (BYOD) and corporate-owned device scenarios, as well as devices for special use cases, such as kiosks, ATMs, and point-of-sale (PoS) systems. These new threat-resistant features are modular—that is, they’re designed to be deployed together, although you can also implement them individually. With all these new features enabled together, organizations can protect themselves immediately against a majority of today’s most sophisticated threats and malware.
diff --git a/windows/whats-new/trusted-platform-module.md b/windows/whats-new/trusted-platform-module.md
index bbbb44215e..50377a2662 100644
--- a/windows/whats-new/trusted-platform-module.md
+++ b/windows/whats-new/trusted-platform-module.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in Trusted Platform Module (Windows 10)
 description: This topic for the IT professional describes new features for the Trusted Platform Module (TPM) in Windows 10.
-MSHAttr: PreferredLib /library
 ms.assetid: CE8BBC2A-EE2D-4DFA-958E-2A178F2E6C44
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/user-account-control.md b/windows/whats-new/user-account-control.md
index 21bc72334f..bd50bdd00a 100644
--- a/windows/whats-new/user-account-control.md
+++ b/windows/whats-new/user-account-control.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in User Account Control (Windows 10)
-description: User Account Control (UAC) helps prevent malware from damaging a computer and helps organizations deploy a better managed desktop environment.
-MSHAttr: PreferredLib /library
+description: User Account Control (UAC) helps prevent malware from damaging a computer and helps organizations deploy a better-managed desktop environment.
 ms.assetid: 9281870C-0819-4694-B4F1-260255BB8D07
 ms.prod: W10
 ms.mktglfcycl: explore
diff --git a/windows/whats-new/windows-spotlight.md b/windows/whats-new/windows-spotlight.md
index efac8adb2b..bcbd1b362f 100644
--- a/windows/whats-new/windows-spotlight.md
+++ b/windows/whats-new/windows-spotlight.md
@@ -1,7 +1,6 @@
 ---
 title: Windows spotlight on the lock screen (Windows 10)
 description: Windows spotlight is an option for the lock screen background that displays different background images and occasionally offers suggestions on the lock screen.
-MSHAttr: PreferredLib /library
 ms.assetid: 1AEA51FA-A647-4665-AD78-2F3FB27AD46A
 keywords: ["lockscreen"]
 ms.prod: W10
@@ -17,13 +16,6 @@ author: TrudyHa
 
 -   Windows 10
 
-**In this article**
-
--   [What does Windows spotlight include?](#what-does-windows-spotlight-include-)
--   [How do you turn off Windows spotlight?](#how-do-you-turn-off-windows-spotlight-)
--   [How do you disable Windows spotlight for managed devices?](#how-do-you-disable-windows-spotlight-for-managed-devices-)
--   [Related topics](#related-topics)
-
 Windows spotlight is an option for the lock screen background that displays different background images and occasionally offers suggestions on the lock screen. Windows spotlight is now available in Windows 10 Pro, Windows 10 Enterprise, and Windows 10 Education. For managed devices running Windows 10 Enterprise and Windows 10 Education, enterprise administrators can configure a mobile device management (MDM) or Group Policy setting to prevent users from using the Windows spotlight background.
 
 ## What does Windows spotlight include?
diff --git a/windows/whats-new/windows-update-for-busines.md b/windows/whats-new/windows-update-for-busines.md
index a92264df29..0d2dfd165d 100644
--- a/windows/whats-new/windows-update-for-busines.md
+++ b/windows/whats-new/windows-update-for-busines.md
@@ -1,7 +1,6 @@
 ---
 title: What's new in Windows Update for Business (Windows 10)
-description: Windows Update for Business enables information technology administrators to keep the Windows 10 based devices in their organization always up to date with the latest security defenses and Windows features by directly connecting these systems to Microsoft’s Windows Update service.
-MSHAttr: PreferredLib /library
+description: Windows Update for Business enables information technology administrators to keep the Windows 10-based devices in their organization always up to date with the latest security defenses and Windows features by directly connecting these systems to Microsoft’s Windows Update service.
 ms.assetid: 9271FC9A-6AF1-4BBD-A272-909BF54363F4
 ms.prod: W10
 ms.mktglfcycl: explore