From 3a68919285e7039d36ae45a12fe3285021f18802 Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Wed, 19 Jun 2019 08:24:18 -0700 Subject: [PATCH] Cleaned up and added alt text --- .../mdm/policy-csp-cryptography.md | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-cryptography.md b/windows/client-management/mdm/policy-csp-cryptography.md index 1921989b07..811f4acfc2 100644 --- a/windows/client-management/mdm/policy-csp-cryptography.md +++ b/windows/client-management/mdm/policy-csp-cryptography.md @@ -6,7 +6,7 @@ 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 --- @@ -18,31 +18,20 @@ manager: dansimp ## Cryptography policies +[Cryptography/AllowFipsAlgorithmPolicy](#CryptographyAllowFipsAlgorithmPolicy) +[Cryptography/TLSCipherSuites](#CryptographyTLSCipherSuites) -<<<<<<< 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)
-<<<<<<< HEAD -## Cryptography/AllowFipsAlgorithmPolicy -======= ## Cryptography/AllowFipsAlgorithmPolicy ->>>>>>> master |Home|Pro|Business |Enterprise |Education |Mobile |Mobile Enterprise | | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -|![][x] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check]| - +|![No][x] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check]| @@ -77,16 +66,12 @@ The following list shows the supported values: -<<<<<<< HEAD -## Cryptography/TLSCipherSuites -======= ## Cryptography/TLSCipherSuites ->>>>>>> master |Home|Pro|Business |Enterprise |Education |Mobile |Mobile Enterprise | | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -|![][x] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check] | ![][check]| +|![No][x] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check] | ![Yes][check]| @@ -123,6 +108,5 @@ Footnote: - [check]: images/checkmark.png "Check" [x]: images/crossmark.png "X"