Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem

2025-05-14 06:17:22 +00:00 · 2017-05-31 10:22:02 -07:00 · 2017-05-31 10:22:02 -07:00 · afd24f521e
commit afd24f521e
parent d3920ae05f fa1d1327f4
227 changed files with 992 additions and 1677 deletions
--- a/windows/access-protection/enterprise-certificate-pinning.md
+++ b/windows/access-protection/enterprise-certificate-pinning.md
@ -71,141 +71,41 @@ Each PinRule element contains a sequence of one or more Site elements and a sequ
 The PinRules element can have the following attributes. 
 For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml) or [Representing a Duration in XML](#representing-a-duration-in-xml). 

- **Duration** or **NextUpdate**
-
-    Specifies when the Pin Rules will expire. 
-    Either is required. 
-    **NextUpdate** takes precedence if both are specified. 
-    
-    **Duration**, represented as an XML TimeSpan data type, does not allow years and months. 
-    You represent the **NextUpdate** attribute as a XML DateTime data type in UTC. 
-    
-    **Required?** Yes. At least one is required.
-
- **LogDuration** or **LogEndDate**
-
-    Configures auditing only to extend beyond the expiration of enforcing the Pin Rules.
-    
-    **LogEndDate**, represented as an XML DateTime data type in UTC, takes precedence if both are specified. 
-    
-    You represent **LogDuration** as an XML TimeSpan data type, which does not allow years and months. 
-    
-    If neither attribute is specified, auditing expiration uses **Duration** or **NextUpdate** attributes.
-    
-    **Required?** No.
-
- **ListIdentifier**
-
-    Provides a friendly name for the list of pin rules. 
-    Windows does not use this attribute for certificate pinning enforcement, however it is included when the pin rules are converted to a certificate trust list (CTL).
-
-    **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+|  **Duration** or **NextUpdate** | Specifies when the Pin Rules will expire. Either is required. **NextUpdate** takes precedence if both are specified. <br>  **Duration**, represented as an XML TimeSpan data type, does not allow years and months. You represent the **NextUpdate** attribute as a XML DateTime data type in UTC.  | **Required?** Yes. At least one is required. |
+| **LogDuration** or **LogEndDate** | Configures auditing only to extend beyond the expiration of enforcing the Pin Rules. <br>  **LogEndDate**, represented as an XML DateTime data type in UTC, takes precedence if both are specified. <br>  You represent **LogDuration** as an XML TimeSpan data type, which does not allow years and months. <br>  If neither attribute is specified, auditing expiration uses **Duration** or **NextUpdate** attributes. | No. | 
+| **ListIdentifier** | Provides a friendly name for the list of pin rules. Windows does not use this attribute for certificate pinning enforcement, however it is included when the pin rules are converted to a certificate trust list (CTL). | No. |

 #### PinRule Element    

-The **PinRule** element can have the following attributes: 
+The **PinRule** element can have the following attributes. 

- **Name**
-
-    Uniquely identifies the **PinRule**. 
-    Windows uses this attribute to identify the element for a parsing error or for verbose output. 
-    The attribute is not included in the generated certificate trust list (CTL).
-
-    **Required?** Yes.
-
- **Error**
-
-    Describes the action Windows performs when it encounters a PIN mismatch. 
-    You can choose from the following string values:
-        - **Revoked** - Windows reports the certificate protecting the site as if it was revoked. This typically prevents the user from accessing the site.
-        - **InvalidName** - Windows reports the certificate protecting the site as if the name on the certificate does not match the name of the site. This typically results in prompting the user before accessing the site.
-        - **None** - The default value.  No error is returned. You can use this setting to audit the pin rules without introducing any user friction.      
-
-    **Required?** No.
-
- **Log**  
-
-    A Boolean value represent as string that equals **true** or **false**. 
-    By default, logging is enabled (**true**).
-
-    **Required?** No.
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **Name**  | Uniquely identifies the **PinRule**. Windows uses this attribute to identify the element for a parsing error or for verbose output. The attribute is not included in the generated certificate trust list (CTL). | Yes.|
+| **Error** | Describes the action Windows performs when it encounters a PIN mismatch. You can choose from the following string values: <br>- **Revoked** - Windows reports the certificate protecting the site as if it was revoked. This typically prevents the user from accessing the site. <br>- **InvalidName** - Windows reports the certificate protecting the site as if the name on the certificate does not match the name of the site. This typically results in prompting the user before accessing the site. <br>- **None** - The default value.  No error is returned. You can use this setting to audit the pin rules without introducing any user friction. | No. |
+| **Log** | A Boolean value represent as string that equals **true** or **false**. By default, logging is enabled (**true**). | No. |

 #### Certificate element 

-The **Certificate** element can have the following attributes:
+The **Certificate** element can have the following attributes.

- **File**
-
-    Path to a file containing one or more certificates. 
-    Where the certificate(s) can be encoded as:
-        - single certificate
-        - p7b
-        - sst.
-
-    These files can also be Base64 formatted. 
-    All **Site** elements included in the same **PinRule** element can match any of these certificates.
-    
-    **Required?** Yes (File, Directory or Base64 must be present).
-
- **Directory** 
-
-    Path to a directory containing one or more of the above certificate files. 
-    Skips any files not containing any certificates.    
-
-    **Required?** Yes (File, Directory or Base64 must be present).
-
- **Base64**
-
-    Base64 encoded certificate(s). 
-    Where the certificate(s) can be encoded as:
-        - single certificate
-        - p7b
-        - sst.
-
-    This allows the certificates to be included in the XML file without a file directory dependency.
-
-    > [!Note]
-    > You can use **certutil -encode** to a .cer file into base64. You can then use Notepad to copy and paste the base64 encoded certificate into the pin rule.    
-
-    **Required?** Yes (File, Directory or Base64 must be present).
-
- **EndDate** 
-
-    Enables you to configure an expiration date for when the certificate is no longer valid in the pin rule.  
-
-    If you are in the process of switching to a new root or CA, you can set the **EndDate** to allow matching of this element’s certificates.
-
-    If the current time is past the **EndDate**, then, when creating the certificate trust list (CTL), the parser outputs a warning message and exclude the certificate(s) from the Pin Rule in the generated CTL.
-
-    For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml).
-
-    **Required?** No. 
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **File**  | Path to a file containing one or more certificates.  Where the certificate(s) can be encoded as: <br>- single certificate <br>- p7b <br>- sst <br> These files can also be Base64 formatted.  All **Site** elements included in the same **PinRule** element can match any of these certificates. | Yes (File, Directory or Base64 must be present). |
+| **Directory** | Path to a directory containing one or more of the above certificate files. Skips any files not containing any certificates. | Yes (File, Directory or Base64 must be present). | 
+| **Base64** | Base64 encoded certificate(s). Where the certificate(s) can be encoded as: <br>- single certificate <br>- p7b <br> - sst <br> This allows the certificates to be included in the XML file without a file directory dependency. <br> Note: <br> You can use **certutil -encode** to convert a .cer file into base64. You can then use Notepad to copy and paste the base64 encoded certificate into the pin rule.  | Yes (File, Directory or Base64 must be present). |
+| **EndDate** | Enables you to configure an expiration date for when the certificate is no longer valid in the pin rule. <br>If you are in the process of switching to a new root or CA, you can set the **EndDate** to allow matching of this element’s certificates.<br> If the current time is past the **EndDate**, then, when creating the certificate trust list (CTL), the parser outputs a warning message and exclude the certificate(s) from the Pin Rule in the generated CTL.<br> For help with formatting Pin Rules, see [Representing a Date in XML](#representing-a-date-in-xml).| No.|

 #### Site element

-The **Site** element can have the following attributes:
+The **Site** element can have the following attributes.

- **Domain** 
-
-    Contains the DNS name to be matched for this pin rule. 
-    When creating the certificate trust list, the parser normalizes the input name string value as follows:
-        - If the DNS name has a leading "*" it is removed.
-        - Non-ASCII DNS name are converted to ASCII Puny Code.
-        - Upper case ASCII characters are converted to lower case.
-
-    If the normalized name has a leading ".", then, wildcard left hand label matching is enabled. 
-    For example, ".xyz.com" would match "abc.xyz.com".
-
-    **Required?** Yes.
-
- **AllSubdomains**
-
-    By default, wildcard left hand label matching is restricted to a single left hand label. 
-    This attribute can be set to "true" to enable wildcard matching of all of the left hand labels. 
-    
-    For example, setting this attribute would also match "123.abc.xyz.com" for the ".xyz.com" domain value.
-    
-    **Required?** No. 
+| Attribute | Description | Required |
+|-----------|-------------|----------|
+| **Domain** | Contains the DNS name to be matched for this pin rule. When creating the certificate trust list, the parser normalizes the input name string value as follows: <br>- If the DNS name has a leading "*" it is removed. <br>- Non-ASCII DNS name are converted to ASCII Puny Code. <br>- Upper case ASCII characters are converted to lower case. <br>If the normalized name has a leading ".", then, wildcard left hand label matching is enabled. For example, ".xyz.com" would match "abc.xyz.com". | Yes.|
+| **AllSubdomains** | By default, wildcard left hand label matching is restricted to a single left hand label. This attribute can be set to "true" to enable wildcard matching of all of the left-hand labels.<br>For example, setting this attribute would also match "123.abc.xyz.com" for the ".xyz.com" domain value.| No.|
    
 ### Create a Pin Rules Certificate Trust List

@ -302,10 +202,6 @@ Sign-in to the reference computer using domain administrator equivalent credenti

 To assist in constructing certificate pinning rules, you can configure the **PinRulesLogDir** setting under the certificate chain configuration registry key to include a parent directory to log pin rules.

-```code
-HKLM\SOFTWARE\Microsoft\Cryptography\OID\EncodingType0\CertDllCreateCertificateChainEngine\Config
-```
-
 | Name | Value |
 |------|-------|
 | Key | HKLM\SOFTWARE\Microsoft\Cryptography\OID\EncodingType0\CertDllCreateCertificateChainEngine\Config |
--- a/windows/client-management/mdm/activesync-csp.md
+++ b/windows/client-management/mdm/activesync-csp.md
@ -1,15 +1,12 @@
 ---
 title: ActiveSync CSP
 description: ActiveSync CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: c65093ef-bd36-4f32-9dab-edb7bcfb3188
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # ActiveSync CSP
--- a/windows/client-management/mdm/activesync-ddf-file.md
+++ b/windows/client-management/mdm/activesync-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: ActiveSync DDF file
 description: ActiveSync DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: c4cd4816-ad8f-45b2-9b81-8abb18254096
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # ActiveSync DDF file
--- a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
+++ b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
@ -1,15 +1,12 @@
 ---
 title: Add an Azure AD tenant and Azure AD subscription
 description: Here's a step-by-step guide to adding an Azure Active Directory tenant, adding an Azure AD subscription, and registering your subscription.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 36D94BEC-A6D8-47D2-A547-EBD7B7D163FA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Add an Azure AD tenant and Azure AD subscription
--- a/windows/client-management/mdm/alljoynmanagement-csp.md
+++ b/windows/client-management/mdm/alljoynmanagement-csp.md
@ -1,15 +1,12 @@
 ---
 title: AllJoynManagement CSP
 description: The AllJoynManagement configuration service provider (CSP) allows an IT administrator to enumerate the AllJoyn devices that are connected to the AllJoyn bus.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 468E0EE5-EED3-48FF-91C0-89F9D159AA8C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AllJoynManagement CSP
--- a/windows/client-management/mdm/alljoynmanagement-ddf.md
+++ b/windows/client-management/mdm/alljoynmanagement-ddf.md
@ -1,15 +1,12 @@
 ---
 title: AllJoynManagement DDF
 description: AllJoynManagement DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 540C2E60-A041-4749-A027-BBAF0BB046E4
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AllJoynManagement DDF
--- a/windows/client-management/mdm/application-csp.md
+++ b/windows/client-management/mdm/application-csp.md
@ -1,15 +1,12 @@
 ---
 title: APPLICATION configuration service provider
 description: APPLICATION configuration service provider
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 0705b5e9-a1e7-4d70-a73d-7f758ffd8099
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # APPLICATION configuration service provider
--- a/windows/client-management/mdm/applicationrestrictions-xsd.md
+++ b/windows/client-management/mdm/applicationrestrictions-xsd.md
@ -1,15 +1,12 @@
 ---
 title: ApplicationRestrictions XSD
 description: Here's the XSD for the ApplicationManagement/ApplicationRestrictions policy.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A5AA2B59-3736-473E-8F70-A90FD61EE426
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # ApplicationRestrictions XSD
--- a/windows/client-management/mdm/applocker-csp.md
+++ b/windows/client-management/mdm/applocker-csp.md
@ -1,15 +1,12 @@
 ---
 title: AppLocker CSP
 description: AppLocker CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 32FEA2C9-3CAD-40C9-8E4F-E3C69637580F
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AppLocker CSP
--- a/windows/client-management/mdm/applocker-ddf-file.md
+++ b/windows/client-management/mdm/applocker-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: AppLocker DDF file
 description: AppLocker DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 79E199E0-5454-413A-A57A-B536BDA22496
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AppLocker DDF file
--- a/windows/client-management/mdm/applocker-xsd.md
+++ b/windows/client-management/mdm/applocker-xsd.md
@ -1,15 +1,12 @@
 ---
 title: AppLocker XSD
 description: Here's the XSD for the AppLocker CSP.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 70CF48DD-AD7D-4BCF-854F-A41BFD95F876
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AppLocker XSD
--- a/windows/client-management/mdm/appv-deploy-and-config.md
+++ b/windows/client-management/mdm/appv-deploy-and-config.md
@ -1,14 +1,11 @@
 ---
 title: Deploy and configure App-V apps using MDM
 description: Deploy and configure App-V apps using MDM
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Deploy and configure App-V apps using MDM
--- a/windows/client-management/mdm/assign-seats.md
+++ b/windows/client-management/mdm/assign-seats.md
@ -1,15 +1,12 @@
 ---
 title: Assign seat
 description: The Assign seat operation assigns seat for a specified user in the Windows Store for Business.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: B42BF490-35C9-405C-B5D6-0D9F0E377552
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Assign seat
--- a/windows/client-management/mdm/assignedaccess-csp.md
+++ b/windows/client-management/mdm/assignedaccess-csp.md
@ -1,15 +1,12 @@
 ---
 title: AssignedAccess CSP
 description: The AssignedAccess configuration service provider (CSP) is used set the device to run in kiosk mode.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 421CC07D-6000-48D9-B6A3-C638AAF83984
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AssignedAccess CSP
--- a/windows/client-management/mdm/assignedaccess-ddf.md
+++ b/windows/client-management/mdm/assignedaccess-ddf.md
@ -1,15 +1,12 @@
 ---
 title: AssignedAccess DDF
 description: AssignedAccess DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 224FADDB-0EFD-4E5A-AE20-1BD4ABE24306
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # AssignedAccess DDF
--- a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
+++ b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
@ -1,15 +1,12 @@
 ---
 title: Azure Active Directory integration with MDM
 description: Azure Active Directory is the world largest enterprise cloud identity management service.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: D03B0765-5B5F-4C7B-9E2B-18E747D504EE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 <head>
--- a/windows/client-management/mdm/bitlocker-csp.md
+++ b/windows/client-management/mdm/bitlocker-csp.md
@ -1,14 +1,11 @@
 ---
 title: BitLocker CSP
 description: BitLocker CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # BitLocker CSP
--- a/windows/client-management/mdm/bitlocker-ddf-file.md
+++ b/windows/client-management/mdm/bitlocker-ddf-file.md
@ -1,14 +1,11 @@
 ---
 title: BitLocker DDF file
 description: BitLocker DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # BitLocker DDF file
--- a/windows/client-management/mdm/bootstrap-csp.md
+++ b/windows/client-management/mdm/bootstrap-csp.md
@ -1,15 +1,12 @@
 ---
 title: BOOTSTRAP CSP
 description: BOOTSTRAP CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: b8acbddc-347f-4543-a45b-ad2ffae3ffd0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # BOOTSTRAP CSP
--- a/windows/client-management/mdm/browserfavorite-csp.md
+++ b/windows/client-management/mdm/browserfavorite-csp.md
@ -1,15 +1,12 @@
 ---
 title: BrowserFavorite CSP
 description: BrowserFavorite CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 5d2351ff-2d6a-4273-9b09-224623723cbf
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # BrowserFavorite CSP
--- a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
+++ b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
@ -1,15 +1,12 @@
 ---
 title: Bulk assign and reclaim seats from users
 description: The Bulk assign and reclaim seats from users operation returns reclaimed or assigned seats in the Windows Store for Business.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 99E2F37D-1FF3-4511-8969-19571656780A
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Bulk assign and reclaim seats from users
--- a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
+++ b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
@ -4,15 +4,12 @@ description: Bulk enrollment is an efficient way to set up a large number of dev
 MS-HAID:
 - 'p\_phdevicemgmt.bulk\_enrollment'
 - 'p\_phDeviceMgmt.bulk\_enrollment\_using\_Windows\_provisioning\_tool'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: DEB98FF3-CC5C-47A1-9277-9EF939716C87
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---


--- a/windows/client-management/mdm/cellularsettings-csp.md
+++ b/windows/client-management/mdm/cellularsettings-csp.md
@ -1,15 +1,12 @@
 ---
 title: CellularSettings CSP
 description: CellularSettings CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: ce8b6f16-37ca-4aaf-98b0-306d12e326df
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CellularSettings CSP
--- a/windows/client-management/mdm/certificate-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
@ -1,15 +1,12 @@
 ---
 title: Certificate authentication device enrollment
 description: This section provides an example of the mobile device enrollment protocol using certificate authentication policy.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 57DB3C9E-E4C9-4275-AAB5-01315F9D3910
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Certificate authentication device enrollment
--- a/windows/client-management/mdm/certificate-renewal-windows-mdm.md
+++ b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
@ -4,15 +4,12 @@ description: The enrolled client certificate expires after a period of use.
 MS-HAID:
 - 'p\_phdevicemgmt.certificate\_renewal'
 - 'p\_phDeviceMgmt.certificate\_renewal\_windows\_mdm'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: F910C50C-FF67-40B0-AAB0-CA7CE02A9619
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Certificate Renewal
--- a/windows/client-management/mdm/certificatestore-csp.md
+++ b/windows/client-management/mdm/certificatestore-csp.md
@ -1,15 +1,12 @@
 ---
 title: CertificateStore CSP
 description: CertificateStore CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 0fe28629-3cc3-42a0-91b3-3624c8462fd3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CertificateStore CSP
--- a/windows/client-management/mdm/certificatestore-ddf-file.md
+++ b/windows/client-management/mdm/certificatestore-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: CertificateStore DDF file
 description: This topic shows the OMA DM device description framework (DDF) for the CertificateStore configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: D9A12D4E-3122-45C3-AD12-CC4FFAEC08B8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CertificateStore DDF file
--- a/windows/client-management/mdm/cleanpc-csp.md
+++ b/windows/client-management/mdm/cleanpc-csp.md
@ -1,14 +1,11 @@
 ---
 title: CleanPC CSP
 description: The CleanPC configuration service provider (CSP) allows removal of user-installed and pre-installed applications, with the option to persist user data. This CSP was added in Windows 10, version 1703.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CleanPC CSP
--- a/windows/client-management/mdm/cleanpc-ddf.md
+++ b/windows/client-management/mdm/cleanpc-ddf.md
@ -1,15 +1,12 @@
 ---
 title: CleanPC DDF
 description: This topic shows the OMA DM device description framework (DDF) for the CleanPC configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A2182898-1577-4675-BAE5-2A3A9C2AAC9B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CleanPC DDF
--- a/windows/client-management/mdm/clientcertificateinstall-csp.md
+++ b/windows/client-management/mdm/clientcertificateinstall-csp.md
@ -1,15 +1,12 @@
 ---
 title: ClientCertificateInstall CSP
 description: ClientCertificateInstall CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: B624EB73-2972-47F2-9D7E-826D641BF8A7
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # ClientCertificateInstall CSP
--- a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
+++ b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: ClientCertificateInstall DDF file
 description: ClientCertificateInstall DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 7F65D045-A750-4CDE-A1CE-7D152AA060CA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # ClientCertificateInstall DDF file
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@ -1,15 +1,12 @@
 ---
 title: CM\_CellularEntries CSP
 description: CM\_CellularEntries CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f8dac9ef-b709-4b76-b6f5-34c2e6a3c847
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CM\_CellularEntries CSP
--- a/windows/client-management/mdm/cm-proxyentries-csp.md
+++ b/windows/client-management/mdm/cm-proxyentries-csp.md
@ -1,15 +1,12 @@
 ---
 title: CM\_ProxyEntries CSP
 description: CM\_ProxyEntries CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f4c3dc71-c85a-4c68-9ce9-19f408ff7a0a
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CM\_ProxyEntries CSP
--- a/windows/client-management/mdm/cmpolicy-csp.md
+++ b/windows/client-management/mdm/cmpolicy-csp.md
@ -1,15 +1,12 @@
 ---
 title: CMPolicy CSP
 description: CMPolicy CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 62623915-9747-4eb1-8027-449827b85e6b
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CMPolicy CSP
--- a/windows/client-management/mdm/cmpolicyenterprise-csp.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-csp.md
@ -1,15 +1,12 @@
 ---
 title: CMPolicyEnterprise CSP
 description: CMPolicyEnterprise CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A0BE3458-ABED-4F80-B467-F842157B94BF
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CMPolicyEnterprise CSP
--- a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: CMPolicyEnterprise DDF file
 description: CMPolicyEnterprise DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 065EF07A-0CF3-4EE5-B620-3464A75B7EED
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CMPolicyEnterprise DDF file
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@ -1,22 +1,25 @@
 ---
 title: Configuration service provider reference
 description: A configuration service provider (CSP) is an interface to read, set, modify, or delete configuration settings on the device.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 71823658-951f-4163-9c40-c4d4adceaaec
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Configuration service provider reference

 A configuration service provider (CSP) is an interface to read, set, modify, or delete configuration settings on the device. These settings map to registry keys or files. Some configuration service providers support the WAP format, some support SyncML, and some support both. SyncML is only used over–the–air for Open Mobile Alliance Device Management (OMA DM), whereas WAP can be used over–the–air for OMA Client Provisioning, or it can be included in the phone image as a .provxml file that is installed during boot.

-For information about the bridge WMI provider classes that map to these CSPs, see [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/hardware/dn905224). See the [list of CSPs supported in Windows Holographic](#hololens) and the [list of CSPs supported in Microsoft Surface Hub ](#surfacehubcspsupport) for additional information.
+For information about the bridge WMI provider classes that map to these CSPs, see [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/hardware/dn905224). 
+
+Additional lists:
+- [List of CSPs supported in Windows Holographic](#hololens)
+- [List of CSPs supported in Microsoft Surface Hub ](#surfacehubcspsupport)
+- [List of CSPs supported in Windows 10 IoT Core](#iotcoresupport)
+- [List of CSPs supported in Windows 10 S](#windows10s)

 The following tables show the configuration service providers support in Windows 10.  

@ -2430,3 +2433,54 @@ Footnotes:
 - [Update CSP](update-csp.md)
 - [VPNv2 CSP](vpnv2-csp.md)
 - [WiFi CSP](wifi-csp.md)
+
+## <a href="" id="windows10s"></a>CSPs supported in Windows 10 S
+
+The CSPs supported in Windows 10 S is the same as in Windows 10 Pro except that Office CSP and EnterpriseDesktop CSP are not available in Windows 10 S. Here is the list:
+
+- [ActiveSync CSP](activesync-csp.md)
+- [APPLICATION CSP](application-csp.md)
+- [AppLocker CSP](applocker-csp.md)
+- [BOOTSTRAP CSP](bootstrap-csp.md)
+- [CellularSettings CSP](cellularsettings-csp.md)
+- [CertificateStore CSP](certificatestore-csp.md)
+- [ClientCertificateInstall CSP](clientcertificateinstall-csp.md)
+- [CM_CellularEntries CSP](cm-cellularentries-csp.md)
+- [Defender CSP](defender-csp.md)
+- [DevDetail CSP](devdetail-csp.md)
+- [DeviceManageability CSP](devicemanageability-csp.md)
+- [DeviceStatus CSP](devicestatus-csp.md)
+- [DevInfo CSP](devinfo-csp.md)
+- [DiagnosticLog CSP](diagnosticlog-csp.md)
+- [DMAcc CSP](dmacc-csp.md)
+- [DMClient CSP](dmclient-csp.md)
+- [EMAIL2 CSP](email2-csp.md)
+- [EnterpriseAPN CSP](enterpriseapn-csp.md)
+- [EnterpriseDataProtection CSP](enterprisedataprotection-csp.md)
+- [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md)
+- [HealthAttestation CSP](healthattestation-csp.md)
+- [NAP CSP](nap-csp.md)
+- [NAPDEF CSP](napdef-csp.md)
+- [NetworkProxy CSP](networkproxy-csp.md)
+- [NodeCache CSP](nodecache-csp.md)
+- [PassportForWork CSP](passportforwork-csp.md)
+- [Policy CSP](policy-configuration-service-provider.md)
+- [Provisioning CSP](provisioning-csp.md)
+- [PROXY CSP](proxy-csp.md)
+- [PXLOGICAL CSP](pxlogical-csp.md)
+- [Reboot CSP](reboot-csp.md)
+- [RemoteFind CSP](remotefind-csp.md)
+- [RemoteWipe CSP](remotewipe-csp.md)
+- [Reporting CSP](reporting-csp.md)
+- [RootCATrustedCertificates CSP](rootcacertificates-csp.md)
+- [SecureAssessment CSP](secureassessment-csp.md)
+- [SecurityPolicy CSP](securitypolicy-csp.md)
+- [SharedPC CSP](sharedpc-csp.md)
+- [Storage CSP](storage-csp.md)
+- [SUPL CSP](supl-csp.md)
+- [Update CSP](update-csp.md)
+- [VPNv2 CSP](vpnv2-csp.md)
+- [WiFi CSP](wifi-csp.md)
+- [Win32AppInventory CSP](win32appinventory-csp.md)
+- [WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)
+- [WindowsLicensing CSP](windowslicensing-csp.md)
--- a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
+++ b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
@ -1,15 +1,12 @@
 ---
 title: Create a custom configuration service provider
 description: Create a custom configuration service provider
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 0cb37f03-5bf2-4451-8276-23f4a1dee33f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Create a custom configuration service provider
--- a/windows/client-management/mdm/customdeviceui-csp.md
+++ b/windows/client-management/mdm/customdeviceui-csp.md
@ -1,15 +1,12 @@
 ---
 title: CustomDeviceUI CSP
 description: CustomDeviceUI CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 20ED1867-7B9E-4455-B397-53B8B15C95A3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CustomDeviceUI CSP
--- a/windows/client-management/mdm/customdeviceui-ddf.md
+++ b/windows/client-management/mdm/customdeviceui-ddf.md
@ -1,15 +1,12 @@
 ---
 title: CustomDeviceUI DDF
 description: CustomDeviceUI DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: E6D6B902-C57C-48A6-9654-CCBA3898455E
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # CustomDeviceUI DDF
--- a/windows/client-management/mdm/data-structures-windows-store-for-business.md
+++ b/windows/client-management/mdm/data-structures-windows-store-for-business.md
@ -3,16 +3,13 @@ title: Data structures for Windows Store for Business
 MS-HAID:
 - 'p\_phdevicemgmt.business\_store\_data\_structures'
 - 'p\_phDeviceMgmt.data\_structures\_windows\_store\_for\_business'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: ABE44EC8-CBE5-4775-BA8A-4564CB73531B
 description: 
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Data structures for Windows Store for Business
--- a/windows/client-management/mdm/defender-csp.md
+++ b/windows/client-management/mdm/defender-csp.md
@ -1,15 +1,12 @@
 ---
 title: Defender CSP
 description: Defender CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 481AA74F-08B2-4A32-B95D-5A3FD05B335C
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Defender CSP
--- a/windows/client-management/mdm/defender-ddf.md
+++ b/windows/client-management/mdm/defender-ddf.md
@ -1,15 +1,12 @@
 ---
 title: Defender DDF file
 description: Defender DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 39B9E6CF-4857-4199-B3C3-EC740A439F65
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Defender DDF file
--- a/windows/client-management/mdm/design-a-custom-windows-csp.md
+++ b/windows/client-management/mdm/design-a-custom-windows-csp.md
@ -4,15 +4,12 @@ description: Design a custom configuration service provider
 MS-HAID:
 - 'p\_phDeviceMgmt.designing\_a\_custom\_configuration\_service\_provider'
 - 'p\_phDeviceMgmt.design\_a\_custom\_windows\_csp'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 0fff9516-a71a-4036-a57b-503ef1a81a37
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Design a custom configuration service provider
--- a/windows/client-management/mdm/devdetail-csp.md
+++ b/windows/client-management/mdm/devdetail-csp.md
@ -1,15 +1,12 @@
 ---
 title: DevDetail CSP
 description: DevDetail CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 719bbd2d-508d-439b-b175-0874c7e6c360
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DevDetail CSP
--- a/windows/client-management/mdm/devdetail-ddf-file.md
+++ b/windows/client-management/mdm/devdetail-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: DevDetail DDF file
 description: DevDetail DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 645fc2b5-2d2c-43b1-9058-26bedbe9f00d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DevDetail DDF file
--- a/windows/client-management/mdm/developersetup-csp.md
+++ b/windows/client-management/mdm/developersetup-csp.md
@ -1,15 +1,12 @@
 ---
 title: DeveloperSetup CSP
 description: The DeveloperSetup configuration service provider (CSP) is used to configure developer mode on the device. This CSP was added in the next major update of Windows 10.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeveloperSetup CSP
--- a/windows/client-management/mdm/developersetup-ddf.md
+++ b/windows/client-management/mdm/developersetup-ddf.md
@ -1,15 +1,12 @@
 ---
 title: DeveloperSetup DDF file
 description: This topic shows the OMA DM device description framework (DDF) for the DeveloperSetup configuration service provider. This CSP was added in Windows 10, version 1703.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeveloperSetup DDF file
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@ -1,15 +1,12 @@
 ---
 title: Device update management
 description: In the current device landscape of PC, tablets, phones, and IoT devices, the Mobile Device Management (MDM) solutions are becoming prevalent as a lightweight device management technology.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: C27BAEE7-2890-4FB7-9549-A6EACC790777
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---


--- a/windows/client-management/mdm/deviceinstanceservice-csp.md
+++ b/windows/client-management/mdm/deviceinstanceservice-csp.md
@ -1,15 +1,12 @@
 ---
 title: DeviceInstanceService CSP
 description: DeviceInstanceService CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: f113b6bb-6ce1-45ad-b725-1b6610721e2d
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceInstanceService CSP
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@ -1,15 +1,12 @@
 ---
 title: DeviceLock CSP
 description: DeviceLock CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9a547efb-738e-4677-95d3-5506d350d8ab
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceLock CSP
--- a/windows/client-management/mdm/devicelock-ddf-file.md
+++ b/windows/client-management/mdm/devicelock-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: DeviceLock DDF file
 description: DeviceLock DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 46a691b9-6350-4987-bfc7-f8b1eece3ad9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceLock DDF file
--- a/windows/client-management/mdm/devicemanageability-csp.md
+++ b/windows/client-management/mdm/devicemanageability-csp.md
@ -1,15 +1,12 @@
 ---
 title: DeviceManageability CSP
 description: The DeviceManageability configuration service provider (CSP) is used retrieve the general information about MDM configuration capabilities on the device. This CSP was added in Windows 10, version 1607.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: FE563221-D5B5-4EFD-9B60-44FE4066B0D2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceManageability CSP
--- a/windows/client-management/mdm/devicemanageability-ddf.md
+++ b/windows/client-management/mdm/devicemanageability-ddf.md
@ -1,15 +1,12 @@
 ---
 title: DeviceManageability DDF
 description: This topic shows the OMA DM device description framework (DDF) for the DeviceManageability configuration service provider. This CSP was added in Windows 10, version 1607.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: D7FA8D51-95ED-40D2-AA84-DCC4BBC393AB
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceManageability DDF
--- a/windows/client-management/mdm/devicestatus-csp.md
+++ b/windows/client-management/mdm/devicestatus-csp.md
@ -1,15 +1,12 @@
 ---
 title: DeviceStatus CSP
 description: The DeviceStatus configuration service provider is used by the enterprise to keep track of device inventory and query the state of compliance of these devices with their enterprise policies.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 039B2010-9290-4A6E-B77B-B2469B482360
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceStatus CSP
--- a/windows/client-management/mdm/devicestatus-ddf.md
+++ b/windows/client-management/mdm/devicestatus-ddf.md
@ -1,15 +1,12 @@
 ---
 title: DeviceStatus DDF
 description: This topic shows the OMA DM device description framework (DDF) for the DeviceStatus configuration service provider. DDF files are used only with OMA DM provisioning XML.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 780DC6B4-48A5-4F74-9F2E-6E0D88902A45
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DeviceStatus DDF
--- a/windows/client-management/mdm/devinfo-csp.md
+++ b/windows/client-management/mdm/devinfo-csp.md
@ -1,15 +1,12 @@
 ---
 title: DevInfo CSP
 description: DevInfo CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: d3eb70db-1ce9-4c72-a13d-651137c1713c
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DevInfo CSP
--- a/windows/client-management/mdm/devinfo-ddf-file.md
+++ b/windows/client-management/mdm/devinfo-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: DevInfo DDF file
 description: DevInfo DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: beb07cc6-4133-4c0f-aa05-64db2b4a004f
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DevInfo DDF file
--- a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
+++ b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
@ -1,15 +1,12 @@
 ---
 title: Diagnose MDM failures in Windows 10
 description: To help diagnose enrollment or device management issues in Windows 10 devices managed by an MDM server, you can examine the MDM logs collected from the desktop or mobile device. The following sections describe the procedures for collecting MDM logs.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 12D8263B-D839-4B19-9346-31E0CDD0CBF9
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Diagnose MDM failures in Windows 10
--- a/windows/client-management/mdm/diagnosticlog-csp.md
+++ b/windows/client-management/mdm/diagnosticlog-csp.md
@ -1,15 +1,12 @@
 ---
 title: DiagnosticLog CSP
 description: DiagnosticLog CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: F76E0056-3ACD-48B2-BEA1-1048C96571C3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DiagnosticLog CSP
--- a/windows/client-management/mdm/diagnosticlog-ddf.md
+++ b/windows/client-management/mdm/diagnosticlog-ddf.md
@ -1,15 +1,12 @@
 ---
 title: DiagnosticLog DDF
 description: DiagnosticLog DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9DD75EDA-5913-45B4-9BED-20E30CDEBE16
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DiagnosticLog DDF
--- a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
+++ b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
@ -4,15 +4,12 @@ description: Disconnecting may be initiated either locally by the user from the
 MS-HAID:
 - 'p\_phdevicemgmt.disconnecting\_from\_the\_management\_infrastructure\_\_unenrollment\_'
 - 'p\_phDeviceMgmt.disconnecting\_from\_mdm\_unenrollment'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 33B2B248-631B-451F-B534-5DA095C4C8E8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---


--- a/windows/client-management/mdm/dmacc-csp.md
+++ b/windows/client-management/mdm/dmacc-csp.md
@ -1,15 +1,12 @@
 ---
 title: DMAcc CSP
 description: DMAcc CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 43e73d8a-6617-44e7-8459-5c96f4422e63
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMAcc CSP
--- a/windows/client-management/mdm/dmacc-ddf-file.md
+++ b/windows/client-management/mdm/dmacc-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: DMAcc DDF file
 description: DMAcc DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 44dc99aa-2a85-498b-8f52-a81863765606
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMAcc DDF file
--- a/windows/client-management/mdm/dmclient-csp.md
+++ b/windows/client-management/mdm/dmclient-csp.md
@ -1,15 +1,12 @@
 ---
 title: DMClient CSP
 description: The DMClient configuration service provider is used to specify additional enterprise-specific mobile device management configuration settings for identifying the device in the enterprise domain, security mitigation for certificate renewal, and server-triggered enterprise unenrollment.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: a5cf35d9-ced0-4087-a247-225f102f2544
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMClient CSP
--- a/windows/client-management/mdm/dmclient-ddf-file.md
+++ b/windows/client-management/mdm/dmclient-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: DMClient DDF file
 description: DMClient DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A21B33AF-DB76-4059-8170-FADF2CB898A0
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMClient DDF file
--- a/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
+++ b/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
@ -1,9 +1,6 @@
 ---
 title: DMProcessConfigXMLFiltered function
 description: Configures phone settings by using OMA Client Provisioning XML.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 Search.Refinement.TopicID: 184
 ms.assetid: 31D79901-6206-454C-AE78-9B85A3B3487F
 keywords: ["DMProcessConfigXMLFiltered function"]
@ -15,11 +12,11 @@ api_location:
 - dmprocessxmlfiltered.dll
 api_type:
 - DllExport
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMProcessConfigXMLFiltered function
--- a/windows/client-management/mdm/dmsessionactions-csp.md
+++ b/windows/client-management/mdm/dmsessionactions-csp.md
@ -1,14 +1,11 @@
 ---
 title: DMSessionActions CSP
 description: DMSessionActions CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMSessionActions CSP
--- a/windows/client-management/mdm/dmsessionactions-ddf.md
+++ b/windows/client-management/mdm/dmsessionactions-ddf.md
@ -1,14 +1,11 @@
 ---
 title: DMSessionActions DDF file
 description: DMSessionActions DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DMSessionActions DDF file
--- a/windows/client-management/mdm/dynamicmanagement-csp.md
+++ b/windows/client-management/mdm/dynamicmanagement-csp.md
@ -1,14 +1,11 @@
 ---
 title: DynamicManagement CSP
 description: DynamicManagement CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DynamicManagement CSP
--- a/windows/client-management/mdm/dynamicmanagement-ddf.md
+++ b/windows/client-management/mdm/dynamicmanagement-ddf.md
@ -1,15 +1,12 @@
 ---
 title: DynamicManagement DDF file
 description: DynamicManagement DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 7e266db0-2fd9-4412-b428-4550f41a1738
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # DynamicManagement DDF file
--- a/windows/client-management/mdm/eap-configuration.md
+++ b/windows/client-management/mdm/eap-configuration.md
@ -1,15 +1,12 @@
 ---
 title: EAP configuration
 description: The topic provides a step-by-step guide for creating an Extensible Authentication Protocol (EAP) configuration XML for the VPN profile and information about EAP certificate filtering in Windows 10.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: DD3F2292-4B4C-4430-A57F-922FED2A8FAE
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EAP configuration
--- a/windows/client-management/mdm/email2-csp.md
+++ b/windows/client-management/mdm/email2-csp.md
@ -1,15 +1,12 @@
 ---
 title: EMAIL2 CSP
 description: EMAIL2 CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: bcfc9d98-bc2e-42c6-9b81-0b5bf65ce2b8
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EMAIL2 CSP
--- a/windows/client-management/mdm/email2-ddf-file.md
+++ b/windows/client-management/mdm/email2-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: EMAIL2 DDF file
 description: EMAIL2 DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 7e266db0-2fd9-4412-b428-4550f41a1738
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EMAIL2 DDF file
--- a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
+++ b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
@ -1,15 +1,12 @@
 ---
 title: Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices
 description: Like any Windows devices, Windows 10 Mobile devices use Microsoft Update by default to download updates over the Internet.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: ED3DAF80-847C-462B-BDB1-486577906772
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Enable offline upgrades to Windows 10 for Windows Embedded 8.1 Handheld devices
--- a/windows/client-management/mdm/enterprise-app-management.md
+++ b/windows/client-management/mdm/enterprise-app-management.md
@ -1,15 +1,12 @@
 ---
 title: Enterprise app management
 description: This topic covers one of the key mobile device management (MDM) features in Windows 10 for managing the lifecycle of apps across all of Windows.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 225DEE61-C3E3-4F75-BC79-5068759DFE99
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Enterprise app management
--- a/windows/client-management/mdm/enterpriseapn-csp.md
+++ b/windows/client-management/mdm/enterpriseapn-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAPN CSP
 description: The EnterpriseAPN configuration service provider is used by the enterprise to provision an APN for the Internet.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: E125F6A5-EE44-41B1-A8CC-DF295082E6B2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAPN CSP
--- a/windows/client-management/mdm/enterpriseapn-ddf.md
+++ b/windows/client-management/mdm/enterpriseapn-ddf.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAPN DDF
 description: EnterpriseAPN DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: A953ADEF-4523-425F-926C-48DA62EB9E21
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAPN DDF
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAppManagement CSP
 description: EnterpriseAppManagement CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 698b8bf4-652e-474b-97e4-381031357623
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAppManagement CSP
--- a/windows/client-management/mdm/enterpriseappvmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-csp.md
@ -1,14 +1,11 @@
 ---
 title: EnterpriseAppVManagement CSP
 description: EnterpriseAppVManagement CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAppVManagement CSP
--- a/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
@ -1,14 +1,11 @@
 ---
 title: EnterpriseAppVManagement DDF file
 description: EnterpriseAppVManagement DDF file
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAppVManagement DDF file
--- a/windows/client-management/mdm/enterpriseassignedaccess-csp.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAssignedAccess CSP
 description: EnterpriseAssignedAccess CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 5F88E567-77AA-4822-A0BC-3B31100639AA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAssignedAccess CSP
--- a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAssignedAccess DDF
 description: EnterpriseAssignedAccess DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 8BD6FB05-E643-4695-99A2-633995884B37
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAssignedAccess DDF
--- a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseAssignedAccess XSD
 description: EnterpriseAssignedAccess XSD
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: BB3B633E-E361-4B95-9D4A-CE6E08D67ADA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseAssignedAccess XSD
--- a/windows/client-management/mdm/enterprisedataprotection-csp.md
+++ b/windows/client-management/mdm/enterprisedataprotection-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseDataProtection CSP
 description: The EnterpriseDataProtection configuration service provider (CSP) is used to configure Windows Information Protection (WIP) (formerly known as Enterprise Data Protection) specific settings.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: E2D4467F-A154-4C00-9208-7798EF3E25B3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseDataProtection CSP
--- a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseDataProtection DDF file
 description: The following topic shows the OMA DM device description framework (DDF) for the EnterpriseDataProtection configuration service provider.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: C6427C52-76F9-4EE0-98F9-DE278529D459
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseDataProtection DDF file
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseDesktopAppManagement CSP
 description: The EnterpriseDesktopAppManagement configuration service provider is used to handle enterprise desktop application management tasks, such as querying installed enterprise applications, installing applications, or removing applications.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 2BFF7491-BB01-41BA-9A22-AB209EE59FC5
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseDesktopAppManagement CSP
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseDesktopAppManagement DDF
 description: This topic shows the OMA DM device description framework (DDF) for the EnterpriseDesktopAppManagement configuration service provider.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: EF448602-65AC-4D59-A0E8-779876542FE3
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseDesktopAppManagement DDF
--- a/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseDesktopAppManagement XSD
 description: This topic contains the XSD schema file for the EnterpriseDesktopAppManagement configuration service provider’s DownloadInstall parameter.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 60980257-4F48-4A68-8E8E-1EF0A3F090E2
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseDesktopAppManagement XSD
--- a/windows/client-management/mdm/enterpriseext-csp.md
+++ b/windows/client-management/mdm/enterpriseext-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseExt CSP
 description: EnterpriseExt CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: ACA5CD79-BBD5-4DD1-86DA-0285B93982BD
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseExt CSP
--- a/windows/client-management/mdm/enterpriseext-ddf.md
+++ b/windows/client-management/mdm/enterpriseext-ddf.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseExt DDF
 description: EnterpriseExt DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 71BF81D4-FBEC-4B03-BF99-F7A5EDD4F91B
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseExt DDF
--- a/windows/client-management/mdm/enterpriseextfilessystem-csp.md
+++ b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseExtFileSystem CSP
 description: EnterpriseExtFileSystem CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: F773AD72-A800-481A-A9E2-899BA56F4426
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseExtFileSystem CSP
--- a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
+++ b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseExtFileSystem DDF
 description: EnterpriseExtFileSystem DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 2D292E4B-15EE-4AEB-8884-6FEE8B92D2D1
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseExtFileSystem DDF
--- a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseModernAppManagement CSP
 description: EnterpriseModernAppManagement CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9DD0741A-A229-41A0-A85A-93E185207C42
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseModernAppManagement CSP
--- a/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseModernAppManagement DDF
 description: EnterpriseModernAppManagement DDF
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseModernAppManagement DDF
--- a/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
@ -1,15 +1,12 @@
 ---
 title: EnterpriseModernAppManagement XSD
 description: Here is the XSD for the application parameters.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: D393D094-25E5-4E66-A60F-B59CC312BF57
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # EnterpriseModernAppManagement XSD
--- a/windows/client-management/mdm/federated-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/federated-authentication-device-enrollment.md
@ -1,15 +1,12 @@
 ---
 title: Federated authentication device enrollment
 description: This section provides an example of the mobile device enrollment protocol using federated authentication policy.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 049ECA6E-1AF5-4CB2-8F1C-A5F22D722DAA
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Federated authentication device enrollment
--- a/windows/client-management/mdm/filesystem-csp.md
+++ b/windows/client-management/mdm/filesystem-csp.md
@ -1,15 +1,12 @@
 ---
 title: FileSystem CSP
 description: FileSystem CSP
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: 9117ee16-ca7a-4efa-9270-c9ac8547e541
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # FileSystem CSP
--- a/windows/client-management/mdm/get-inventory.md
+++ b/windows/client-management/mdm/get-inventory.md
@ -4,15 +4,12 @@ description: The Get Inventory operation retrieves information from the Windows
 MS-HAID:
 - 'p\_phdevicemgmt.get\_seatblock'
 - 'p\_phDeviceMgmt.get\_inventory'
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: C5485722-FC49-4358-A097-74169B204E74
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Get Inventory
--- a/windows/client-management/mdm/get-localized-product-details.md
+++ b/windows/client-management/mdm/get-localized-product-details.md
@ -1,15 +1,12 @@
 ---
 title: Get localized product details
 description: The Get localized product details operation retrieves the localization information of a product from the Windows Store for Business.
-MSHAttr:
- 'PreferredSiteName:MSDN'
- 'PreferredLib:/library/windows/hardware'
 ms.assetid: EF6AFCA9-8699-46C9-A3BB-CD2750C07901
-ms.author: windows-hardware-design-content
-ms.date: 05/02/2017
+ms.author: maricia
 ms.topic: article
-ms.prod: windows-hardware
-ms.technology: windows-oem
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
 ---

 # Get localized product details
--- a/Show More
+++ b/Show More