Merge pull request #515 from MicrosoftDocs/MDBranchUpdatingCryptographyPolicyDoc

Rolled back the syntax to HTML syntax

windows/client-management/mdm/policy-configuration-service-provider.md

@@ -738,10 +738,10 @@ The following diagram shows the Policy configuration service provider in tree fo
 
 <dl>
   <dd>
-    <a href="./policy-csp-cryptography.md#cryptographyallowfipsalgorithmpolicy" id="cryptographyallowfipsalgorithmpolicy">Cryptography/AllowFipsAlgorithmPolicy</a>
+    <a href="./policy-csp-cryptography.md#cryptography-allowfipsalgorithmpolicy" id="cryptography-allowfipsalgorithmpolicy">Cryptography/AllowFipsAlgorithmPolicy</a>
   </dd>
   <dd>
-    <a href="./policy-csp-cryptography.md#cryptographytlsciphersuites" id="cryptographytlsciphersuites">Cryptography/TLSCipherSuites</a>
+    <a href="./policy-csp-cryptography.md#cryptography-tlsciphersuites" id="cryptography-tlsciphersuites">Cryptography/TLSCipherSuites</a>
   </dd>
 </dl>
 
@@ -4395,7 +4395,7 @@ The following diagram shows the Policy configuration service provider in tree fo
 -   [CredentialsDelegation/RemoteHostAllowsDelegationOfNonExportableCredentials](./policy-csp-credentialsdelegation.md#credentialsdelegation-remotehostallowsdelegationofnonexportablecredentials)
 -   [CredentialsUI/DisablePasswordReveal](./policy-csp-credentialsui.md#credentialsui-disablepasswordreveal)
 -   [CredentialsUI/EnumerateAdministrators](./policy-csp-credentialsui.md#credentialsui-enumerateadministrators)
--   [Cryptography/AllowFipsAlgorithmPolicy](./policy-csp-cryptography.md#cryptographyallowfipsalgorithmpolicy)
+-   [Cryptography/AllowFipsAlgorithmPolicy](./policy-csp-cryptography.md#cryptography-allowfipsalgorithmpolicy)
 -   [DataUsage/SetCost4G](./policy-csp-datausage.md#datausage-setcost4g)
 -   [Defender/AllowArchiveScanning](./policy-csp-defender.md#defender-allowarchivescanning)
 -   [Defender/AllowBehaviorMonitoring](./policy-csp-defender.md#defender-allowbehaviormonitoring)
@@ -5260,8 +5260,8 @@ The following diagram shows the Policy configuration service provider in tree fo
 
 -   [Camera/AllowCamera](#camera-allowcamera)
 -   [Cellular/ShowAppCellularAccessUI](#cellular-showappcellularaccessui)
--   [Cryptography/AllowFipsAlgorithmPolicy](#cryptographyallowfipsalgorithmpolicy)
+-   [Cryptography/AllowFipsAlgorithmPolicy](#cryptography-allowfipsalgorithmpolicy)
--   [Cryptography/TLSCipherSuites](#cryptographytlsciphersuites)
+-   [Cryptography/TLSCipherSuites](#cryptography-tlsciphersuites)
 -   [Defender/AllowArchiveScanning](#defender-allowarchivescanning)
 -   [Defender/AllowBehaviorMonitoring](#defender-allowbehaviormonitoring)
 -   [Defender/AllowCloudProtection](#defender-allowcloudprotection)

windows/client-management/mdm/policy-csp-cryptography.md

@@ -6,43 +6,56 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: manikadhiman
-ms.date: 05/14/2018
+ms.date: 06/19/2019
 ms.reviewer: 
 manager: dansimp
 ---
 
 # Policy CSP - Cryptography
 
+
+
 <hr/>
 
 <!--Policies-->
 ## Cryptography policies  
 
+<dl>
+  <dd>
+    <a href="#cryptography-allowfipsalgorithmpolicy">Cryptography/AllowFipsAlgorithmPolicy</a>
+  </dd>
+  <dd>
+    <a href="#cryptography-tlsciphersuites">Cryptography/TLSCipherSuites</a>
+  </dd>
+ </dl>
+
 
-<<<<<<< HEAD
-* [Cryptography/AllowFipsAlgorithmPolicy](#CryptographyAllowFipsAlgorithmPolicy)  
-* [Cryptography/TLSCipherSuites](#CryptographyTLSCipherSuites)
-=======
-* [Cryptography/AllowFipsAlgorithmPolicy](#cryptographyallowfipsalgorithmpolicy)  
-* [Cryptography/TLSCipherSuites](#cryptographytlsciphersuites)
->>>>>>> master
-* [Cryptography/Microsoft Surface Hub](#cryptography-policies-supported-by-microsoft-surface-hub)
 <hr/>
 
 <!--Policy-->
-
+<a href="" id="cryptography-allowfipsalgorithmpolicy"></a>**Cryptography/AllowFipsAlgorithmPolicy**  
-<<<<<<< HEAD
-## <a id="CryptographyAllowFipsAlgorithmPolicy" />Cryptography/AllowFipsAlgorithmPolicy
-=======
-## Cryptography/AllowFipsAlgorithmPolicy
->>>>>>> master
 
 <!--SupportedSKUs-->
-
+<table>
-|Home|Pro|Business	|Enterprise	|Education 	|Mobile	|Mobile Enterprise |
+<tr>
-| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+	<th>Home</th>
-|![][x] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check]|
+	<th>Pro</th>
-
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+</tr>
+</table>
 
 <!--/SupportedSKUs-->
 <!--Scope-->
@@ -58,36 +71,53 @@ manager: dansimp
 Allows or disallows the Federal Information Processing Standard (FIPS) policy.
 
 <!--/Description-->
-<!--RegistryMapped-->
+
-GP Info:  
+<!--ADMXMapped-->
+ADMX Info:  
 -   GP English name: *System cryptography: Use FIPS-compliant algorithms for encryption, hashing, and signing*
 -   GP path: *Windows Settings/Security Settings/Local Policies/Security Options*
 
-<!--/RegistryMapped-->
+<!--/ADMXMapped-->
 <!--SupportedValues-->
 The following list shows the supported values:
 
 -   0 (default) – Not allowed.
 -   1– Allowed.
-
 <!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
 <!--/Policy-->
 
 <hr/>
 
 <!--Policy-->
-
+<a href="" id="cryptography-tlsciphersuites"></a>**Cryptography/TLSCipherSuites**  
-<<<<<<< HEAD
-## <a id="CryptographyTLSCipherSuites" />Cryptography/TLSCipherSuites
-=======
-## Cryptography/TLSCipherSuites
->>>>>>> master
 
 <!--SupportedSKUs-->
-|Home|Pro|Business	|Enterprise	|Education 	|Mobile	|Mobile Enterprise |
+<table>
-| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+<tr>
-|![][x] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check]|
+	<th>Home</th>
-
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /></td>
+</tr>
+</table>
 
 <!--/SupportedSKUs-->
 <!--Scope-->
@@ -103,26 +133,36 @@ The following list shows the supported values:
 Lists the Cryptographic Cipher Algorithms allowed for SSL connections. Format is a semicolon delimited list. Last write win.
 
 <!--/Description-->
+
+<!--ADMXMapped-->
+
+<!--/ADMXMapped-->
+<!--SupportedValues-->
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
 <!--/Policy-->
-<hr/>
 
-Footnote:
-
--   1 - Added in Windows 10, version 1607.
--   2 - Added in Windows 10, version 1703.
--   3 - Added in Windows 10, version 1709.
--   4 - Added in Windows 10, version 1803.
-
-<!--/Policies-->
 
 <!--StartSurfaceHub-->
-##  Cryptography policies supported by Microsoft Surface Hub  
+## <a href="" id="surfacehubpolicies"></a>Cryptography policies supported by Microsoft Surface Hub  
 
-- [Cryptography/AllowFipsAlgorithmPolicy](#CryptographyAllowFipsAlgorithmPolicy)  
+- [Cryptography/AllowFipsAlgorithmPolicy](#cryptography-allowfipsalgorithmpolicy)
-- [Cryptography/TLSCipherSuites](#CryptographyTLSCipherSuites)  
+- [Cryptography/TLSCipherSuites](#cryptography-tlsciphersuites)
-  <!--EndSurfaceHub-->
+<!--EndSurfaceHub-->
 
+<hr/>
 
+Footnotes:
+
+- 1 - Added in Windows 10, version 1607.
+- 2 - Added in Windows 10, version 1703.
+- 3 - Added in Windows 10, version 1709.
+- 4 - Added in Windows 10, version 1803.
+- 5 - Added in Windows 10, version 1809.
 
-[check]: images/checkmark.png "Check"
-[x]: images/crossmark.png "X"