Merge pull request #111381 from jlian/patch-41

Clarity on timeline

Author: Jak-MS

articles/iot-hub/TOC.yml

@@ -85,8 +85,6 @@
   items:
     - name: TLS support
       href: iot-hub-tls-support.md
-    - name: TLS 1.0 and 1.1 deprecation
-      href: iot-hub-tls-deprecating-1-0-and-1-1.md
     - name: Virtual networks support
       href: virtual-network-support.md
     - name: Message enrichments overview
@@ -444,6 +442,8 @@
           href: iot-hub-operations-monitoring.md
         - name: Migrate to diagnostics settings
           href: iot-hub-migrate-to-diagnostics-settings.md
+        - name: TLS 1.0 and 1.1 deprecation
+          href: iot-hub-tls-deprecating-1-0-and-1-1.md
 - name: Resources
   items:
     - name: Support and help options

articles/iot-hub/iot-hub-tls-deprecating-1-0-and-1-1.md

@@ -1,17 +1,21 @@
 ---
-title: Deprecating TLS 1.0 and 1.1 in IoT Hub and Device Provisioning Service (DPS) | Microsoft Docs
-description: Guidelines regarding deprecation of TLS 1.0 and 1.1 and supported ciphers in IoT Hub and DPS.
-author: rezasherafat
-ms.author: rezas
+title: Deprecating TLS 1.0 and 1.1 in IoT Hub | Microsoft Docs
+description: Guidelines regarding deprecation of TLS 1.0 and 1.1 and supported ciphers in IoT Hub.
+author: jlian
+ms.author: jlian
 ms.service: iot-hub
 services: iot-hub
 ms.topic: conceptual
-ms.date: 12/16/2019
+ms.date: 04/14/2020
 ---
 
-# Deprecation of TLS 1.0 and 1.1 in IoT Hub and Device Provisioning Service
+# Deprecation of TLS 1.0 and 1.1 in IoT Hub
 
-To provide best-in-class encryption, IoT Hub and Device Provisioning Service (DPS) are moving to Transport Layer Security (TLS) 1.2 as the encryption mechanism of choice for IoT devices and services. 
+To provide best-in-class encryption, IoT Hub is moving to Transport Layer Security (TLS) 1.2 as the encryption mechanism of choice for IoT devices and services. 
+
+## Timeline
+
+IoT Hub will continue to support TLS 1.0/1.1 until further notice. However, we recommend that all customers migrate to TLS 1.2 as soon as possible.
 
 ## Supported ciphers
 
@@ -22,7 +26,6 @@ The timeline for availability of various ciphers used in TLS handshake is as fol
 * TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (will be supported in second half of 2020)
 * TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (will be supported in second half of 2020)
 
-
 ## Customer feedback
 
 While the TLS 1.2 enforcement is an industry-wide best-in-class encryption choice and will be enabled as planned, we still would like to hear from customers regarding their specific deployments and difficulties adopting TLS 1.2. For this purpose, you can send your comments to [[email protected]](mailto:[email protected]).