Merge branch 'master' into 1610820-damabe1

windows/client-management/mdm/certificatestore-csp.md

@@ -17,7 +17,9 @@ ms.date: 02/28/2020
 
 The CertificateStore configuration service provider is used to add secure socket layers (SSL), intermediate, and self-signed certificates.
 
-> **Note**   The CertificateStore configuration service provider does not support installing client certificates.
+> [!Note]
+> The CertificateStore configuration service provider does not support installing client certificates.
+> The Microsoft protocol version of Open Mobile Alliance (OMA) is case insensitive.
 
  
 
@@ -643,4 +645,3 @@ Configure the device to automatically renew an MDM client certificate with the s
 
 
 
-

windows/client-management/mdm/dmclient-ddf-file.md

@@ -1022,7 +1022,6 @@ The XML below is for Windows 10, version 1803.
                 <DFProperties>
                   <AccessType>
                     <Add />
-                    <Delete />
                     <Get />
                     <Replace />
                   </AccessType>

windows/client-management/troubleshoot-tcpip-netmon.md

@@ -16,6 +16,9 @@ manager: dansimp
 
 In this topic, you will learn how to use Microsoft Network Monitor 3.4, which is a tool for capturing network traffic.
 
+> [Note]
+> Network Monitor is the archived protocol analyzer and is no longer under development. **Microsoft Message Analyzer** is the replacement for Network Monitor. For more details, see [Microsoft Message Analyzer Operating Guide](https://docs.microsoft.com/message-analyzer/microsoft-message-analyzer-operating-guide).
+
 To get started, [download and run NM34_x64.exe](https://www.microsoft.com/download/details.aspx?id=4865). When you install Network Monitor, it installs its driver and hooks it to all the network adapters installed on the device. You can see the same on the adapter properties, as shown in the following image.
 
 ![Adapters](images/nm-adapters.png)