Merge pull request #114989 from MashaMSFT/20200512_master

dirty pr merging master into release branch (hi pri please <3!)

Author: tfosmark

.openpublishing.redirection.json

@@ -2436,6 +2436,16 @@
       "redirect_url": "/azure/cosmos-db/how-to-multi-master",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/sql-api-java-get-started.md",
+      "redirect_url": "/azure/cosmos-db/create-sql-api-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/sql-api-async-java-get-started.md",
+      "redirect_url": "/azure/cosmos-db/create-sql-api-java",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/create-sql-api-dotnet-preview.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-dotnet",
@@ -15093,7 +15103,7 @@
     {
       "source_path": "articles/cosmos-db/create-documentdb-java.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-java",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/cosmos-db/create-documentdb-nodejs.md",
@@ -15172,7 +15182,7 @@
     },
     {
       "source_path": "articles/cosmos-db/documentdb-java-get-started.md",
-      "redirect_url": "/azure/cosmos-db/sql-api-java-get-started",
+      "redirect_url": "/azure/cosmos-db/create-sql-api-java",
       "redirect_document_id": true
     },
     {
@@ -17250,24 +17260,144 @@
       "redirect_url": "/azure/security/azure-disk-encryption-linux-powershell-quickstart",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/service-bus-relay/diagnostic-logs.md",
+      "redirect_url": "/azure/azure-relay/diagnostic-logs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/ip-firewall-virtual-networks.md",
+      "redirect_url": "/azure/azure-relay/ip-firewall-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/network-security.md",
+      "redirect_url": "/azure/azure-relay/network-security",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "articles/service-bus-relay/private-link-service.md",
+      "redirect_url": "/azure/azure-relay/private-link-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-authentication-and-authorization.md",
+      "redirect_url": "/azure/azure-relay/relay-authentication-and-authorization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-create-namespace-portal.md",
+      "redirect_url": "/azure/azure-relay/relay-create-namespace-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-exceptions.md",
+      "redirect_url": "/azure/azure-relay/relay-exceptions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-faq.md",
+      "redirect_url": "/azure/azure-relay/relay-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-dotnet-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-dotnet-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-dotnet-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-dotnet-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-http-requests-dotnet-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-http-requests-dotnet-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-http-requests-node-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-http-requests-node-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-node-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-node-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-node-ws-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-node-ws-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-protocol.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-protocol",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-metrics-azure-monitor.md",
+      "redirect_url": "/azure/azure-relay/relay-metrics-azure-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-migrate-acs-sas.md",
+      "redirect_url": "/azure/azure-relay/relay-migrate-acs-sas",
+      "redirect_document_id": false
+    },            
+    {
+      "source_path": "articles/service-bus-relay/relay-port-settings.md",
+      "redirect_url": "/azure/azure-relay/relay-port-settings",
+      "redirect_document_id": false
+    },            
+    {
+      "source_path": "articles/service-bus-relay/relay-what-is-it.md",
+      "redirect_url": "/azure/azure-relay/relay-what-is-it",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay.md",
+      "redirect_url": "/azure/azure-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay",
+      "redirect_document_id": false
+    },                
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-rest-tutorial.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-rest-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-security-controls.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-security-controls",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-tutorial.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-tutorial",
+      "redirect_document_id": false
+    },                            
     {
       "source_path": "articles/service-bus-relay/relay-wcf-dotnet-get-started.md",
-      "redirect_url": "/azure/service-bus-relay/service-bus-relay-tutorial",
+      "redirect_url": "/azure/azure-relay/azure-relay-tutorial",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-dotnet-how-to-use-relay.md",
-      "redirect_url": "/azure/service-bus-relay/relay-wcf-dotnet-get-started",
+      "redirect_url": "/azure/azure-relay/relay-wcf-dotnet-get-started",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-overview.md",
-      "redirect_url": "/azure/service-bus-relay/relay-what-is-it",
+      "redirect_url": "/azure/azure-relay/relay-what-is-it",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-port-settings.md",
-      "redirect_url": "/azure/service-bus-relay/relay-port-settings",
+      "redirect_url": "/azure/azure-relay/relay-port-settings",
       "redirect_document_id": false
     },
     {
@@ -32612,7 +32742,7 @@
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-security-attributes.md",
-      "redirect_url": "/azure/service-bus-relay/service-bus-relay-security-controls",
+      "redirect_url": "/azure/azure-relay/azure-relay-security-controls",
       "redirect_document_id": false
     },
     {

articles/active-directory/authentication/TOC.yml

@@ -15,7 +15,7 @@
     href: tutorial-enable-sspr-writeback.md
   - name: Configure custom banned password lists
     href: tutorial-configure-custom-password-protection.md
-  - name: Integrate Azure Identity Protection
+  - name: Enable risk-based sign-in protection
     href: tutorial-risk-based-sspr-mfa.md
 - name: Concepts
   expanded: true