Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-bugfix

Author: HeidiSteen

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/cosmos-db/sql-api-async-java-samples.md",
+      "redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/sql-api-java-samples.md",
+      "redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/openshift/howto-azure-monitor-v4.md",
       "redirect_url": "articles/azure-monitor/insights/container-insights-azure-redhat4-setup.md",
@@ -756,6 +766,11 @@
       "redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
+      "redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -2448,6 +2463,11 @@
       "redirect_url": "/azure/cosmos-db/autoscale-faq",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/use-notebook-features-and-commands.md",
+      "redirect_url": "/azure/cosmos-db/use-python-notebook-features-and-commands",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
       "redirect_url": "/azure/cosmos-db/how-to-multi-master",
@@ -8039,7 +8059,7 @@
     },
     {
       "source_path": "articles/azure-functions/functions-create-first-java-maven.md",
-      "redirect_url": "/azure/azure-functions/functions-create-first-java-gradle",
+      "redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?tabs=bash%2Cbrowser&pivots=programming-language-java",
       "redirect_document_id": false
     },
     {

articles/active-directory/develop/TOC.yml

@@ -28,7 +28,9 @@
     items:
     - name: Angular
       href: quickstart-v2-angular.md
-    - name: JavaScript
+    - name: JavaScript - Auth code flow
+      href: quickstart-v2-javascript-auth-code.md
+    - name: JavaScript - Implicit flow 
       href: quickstart-v2-javascript.md
   - name: Web apps
     items:
@@ -73,7 +75,9 @@
     items:
     - name: Angular
       href: tutorial-v2-angular.md
-    - name: JavaScript
+    - name: JavaScript - Auth code flow
+      href: tutorial-v2-javascript-auth-code.md  
+    - name: JavaScript - Implicit flow
       href: tutorial-v2-javascript-spa.md
   - name: Web apps
     items:
@@ -479,6 +483,10 @@
       href: active-directory-optional-claims.md
     - name: Configure token lifetimes
       href: active-directory-configurable-token-lifetimes.md
+    - name: Handle SameSite cookie changes in Chrome browser
+      href: howto-handle-samesite-cookie-changes-chrome-browser.md
+    - name: Handle ITP in Safari 
+      href: reference-third-party-cookies-spas.md
   - name: Application configuration
     displayName: App configuration
     items:

articles/active-directory/develop/index.yml

@@ -45,13 +45,17 @@ landingContent:
             url: scenario-spa-overview.md
       - linkListType: quickstart
         links:
-          - text: JavaScript
+          - text: JavaScript - Auth code
+            url: quickstart-v2-javascript-auth-code.md
+          - text: JavaScript - Implicit
             url: quickstart-v2-javascript.md
           - text: Angular
             url: quickstart-v2-angular.md
       - linkListType: tutorial
         links:
-          - text: JavaScript
+          - text: JavaScript - Auth code
+            url: tutorial-v2-javascript-auth-code.md
+          - text: JavaScript - Implicit
             url: tutorial-v2-javascript-spa.md
       - linkListType: download
         links: