Merge pull request #288148 from xujing-ms/master

Updating IoT Hub to indicate that support is ending for TLS 1.0 and 1.1

Author: Jill Grant

articles/iot-dps/tls-support.md

@@ -136,7 +136,7 @@ Use the links below to configure TLS 1.2 and allowed ciphers in the Azure IoT cl
 
 ## Use TLS 1.2 with IoT Hub
 
-IoT Hub can be configured to use TLS 1.2 when communicating with devices. For more information, see [Deprecating TLS 1.0 and 1.1 for IoT Hub](../iot-hub/iot-hub-tls-deprecating-1-0-and-1-1.md).
+IoT Hub can be configured to use TLS 1.2 when communicating with devices. For more information, see [IoT Hub TLS enforcement](../iot-hub/iot-hub-tls-support.md#enforce-iot-hub-to-use-tls-12-and-strong-cipher-suites).
 
 ## Use TLS 1.2 with IoT Edge
 

articles/iot-hub/.openpublishing.redirection.iot-hub.json

@@ -937,13 +937,13 @@
     },
     {
       "source_path_from_root": "/articles/iot-hub/tls-1.2-everywhere.md",
-      "redirect_url": "/azure/iot-hub/iot-hub-tls-deprecating-1-0-and-1-1",
-      "redirect_document_id": true
+      "redirect_url": "/azure/iot-hub/iot-hub-tls-support",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-tls.md",
       "redirect_url": "/azure/iot-hub/iot-hub-tls-support",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-explorer-cloud-device-messaging.md",
@@ -1535,6 +1535,11 @@
       "redirect_url": "/azure/iot-hub/how-to-device-twins",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-tls-deprecating-1-0-and-1-1.md",
+      "redirect_url": "/azure/iot-hub/iot-hub-tls-support",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/iot-hub/device-twins-node.md",
       "redirect_url": "/azure/iot-hub/how-to-device-twins",

articles/iot-hub/TOC.yml

@@ -424,10 +424,6 @@
       displayName: certificate authority (CA), subordinate CA, certificate versions, unique identifier, key identifier, binary certificate, PEM certificate, PKCS, X.509 certificates, OpenSSL, CSR, thumbprint 
       href: reference-x509-certificates.md
     - name: Feature and API retirement
-      items:
-        - name: TLS 1.0 and 1.1 deprecation
-          displayName: Transport Layer Security 
-          href: iot-hub-tls-deprecating-1-0-and-1-1.md
     - name: Monitoring data reference
       href: monitor-iot-hub-reference.md
 - name: Resources

articles/iot-hub/iot-hub-preview-mode.md

@@ -66,10 +66,10 @@ Do *not* use an IoT hub in preview mode for production. Preview mode is intended
 - We can't guarantee the normal [IoT Hub SLA](https://azure.microsoft.com/support/legal/sla/iot-hub/v1_2/) - do not use for production.
 
 > [!TIP]
-> Preview mode isn't required for [device streams](iot-hub-device-streams-overview.md) and [distributed tracing](iot-hub-distributed-tracing.md). To use these older preview features, follow the their documentation as normal. 
+> Preview mode isn't required for [device streams](iot-hub-device-streams-overview.md) and [distributed tracing](iot-hub-distributed-tracing.md). To use these older preview features, follow their documentation as normal. 
 
 ## Next steps
 
 - To preview the MQTT 5 support, see [IoT Hub MQTT 5 support overview (preview)](../iot/iot-mqtt-5-preview.md)
-- To preview the ECC server certificate, see [Elliptic Curve Cryptography (ECC) server TLS certificate (preview)](iot-hub-tls-support.md#elliptic-curve-cryptography-ecc-server-tls-certificate-preview)
-- To preview TLS fragment size negotiation, see [TLS maximum fragment length negotiation (preview)](iot-hub-tls-support.md#tls-maximum-fragment-length-negotiation-preview)
+- To preview the ECC server certificate, see [Elliptic Curve Cryptography (ECC) server TLS certificate (preview)](iot-hub-tls-support.md#elliptic-curve-cryptography-ecc-server-tls-certificate)
+- To preview TLS fragment size negotiation, see [TLS maximum fragment length negotiation (preview)](iot-hub-tls-support.md#tls-maximum-fragment-length-negotiation)