Merge branch 'master' of https://github.com/Microsoft/sql-docs-pr into 20170914_LinuxHAOverview

Author: MikeRayMSFT

.openpublishing.redirection.json

@@ -1911,12 +1911,12 @@
             "redirect_document_id":false
         },
         {
-            "source_path": "docs/sql/relational-databases/security/encryption/transparent-data-encryption-with-azure-sql-database.md",
+            "source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-with-azure-sql-database.md",
             "redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption-azure-sql",
             "redirect_document_id": false
         },
         {
-            "source_path": "docs/sql/relational-databases/security/encryption/transparent-data-encryption-tde.md",
+            "source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-tde.md",
             "redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption",
             "redirect_document_id": false
         },
@@ -3054,11 +3054,6 @@
             "source_path": "docs/reporting-services/report-server-sharepoint/report-viewer-web-part-on-a-sharepoint-site.md",
             "redirect_url": "/sql/reporting-services/report-server-sharepoint/deploy-report-viewer-web-part",
             "redirect_document_id": false
-        },
-        {
-            "source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-tde.md",
-            "redirect_url": "/sql/relational-databases/security/encryption/transparent-data-encryption",
-            "redirect_document_id": false
         }
     ]
-}
+}