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

Author: msmimart

.openpublishing.publish.config.json

@@ -151,8 +151,37 @@
       "url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
       "branch": "master",
       "branch_mapping": {}
+    },   
+    {
+      "path_to_root": "functions-quickstart-templates",
+      "url": "https://github.com/Azure/azure-functions-templates",
+      "branch": "dev"
+    }, 
+    {
+      "path_to_root": "functions-docs-csharp",
+      "url": "https://github.com/Azure-Samples/functions-docs-csharp",
+      "branch": "master"
     },    
     {
+      "path_to_root": "functions-docs-javascript",
+      "url": "https://github.com/Azure-Samples/functions-docs-javascript",
+      "branch": "master"
+    },
+    {
+      "path_to_root": "functions-docs-typescript",
+      "url": "https://github.com/Azure-Samples/functions-docs-typescript",
+      "branch": "master"
+    },    
+    {
+      "path_to_root": "functions-docs-python",
+      "url": "https://github.com/Azure-Samples/functions-docs-python",
+      "branch": "master"
+    },    
+    {
+      "path_to_root": "functions-docs-powershell",
+      "url": "https://github.com/Azure-Samples/functions-docs-powershell",
+      "branch": "master"
+    },     {
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
       "branch": "master"

.openpublishing.redirection.json

@@ -250,7 +250,7 @@
       "redirect_url": "/azure/virtual-machines/",
       "redirect_document_id": false
     },
-    {  
+    {
       "source_path": "articles/virtual-machines/dc-series.md",
       "redirect_url": "/azure/virtual-machines/sizes-previous-gen",
       "redirect_document_id": false
@@ -525,7 +525,7 @@
       "redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
       "redirect_document_id": false
     },
- 
+
     {
       "source_path": "articles/machine-learning/service/quickstart-get-started.md",
       "redirect_url": "/azure/machine-learning/service/tutorial-1st-experiment-sdk-setup",
@@ -828,7 +828,7 @@
     },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Quickstarts/create-knowledge-rest-api-nodejs.md",
-      "redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/publish-kb-nodejs",
+      "redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/quickstart-sdk",
       "redirect_document_id": false
     },
     {
@@ -846,6 +846,78 @@
       "redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-csharp.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-go.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-java.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/create-new-kb-python.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-csharp.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-go.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-java.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-python.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/get-answer-from-knowledge-base-nodejs.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-csharp.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-go.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-java.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-python.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/QnaMaker/quickstarts/publish-kb-nodejs.md",
+      "redirect_url": "/azure/cognitive-services/QnaMaker/quickstarts/quickstart-rest-curl",
+      "redirect_document_id": false
+    },
+
     {
       "source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-csharp-appinsights.md",
       "redirect_url": "/azure/cognitive-services/LUIS/luis-csharp-tutorial-bf-v4",
@@ -7186,6 +7258,26 @@
       "redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-functions/functions-create-first-function-python.md",
+      "redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/functions-create-first-function-powershell.md",
+      "redirect_url": "/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/functions-create-first-azure-function-azure-cli-linux.md",
+      "redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?pivots=programming-language-python",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "articles/azure-functions/functions-add-output-binding-storage-queue-python.md",
+      "redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli.md?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-functions/create-visual-studio.md",
       "redirect_url": "/azure/azure-functions/functions-create-your-first-function-visual-studio",
@@ -13391,6 +13483,11 @@
       "redirect_url": "/azure/event-hubs/event-hubs-faq",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-hubs/event-hubs-authentication-and-security-model-overview.md",
+      "redirect_url": "/azure/event-hubs/authenticate-shared-access-signature",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/event-hubs/event-hubs-c-ephcs-getstarted.md",
       "redirect_url": "/azure/event-hubs/event-hubs-c-getstarted-send",
@@ -13845,7 +13942,7 @@
       "source_path": "articles/cosmos-db/geospatial.md",
       "redirect_url": "/azure/cosmos-db/sql-query-geospatial-intro",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path": "articles/documentdb/documentdb-get-started-quickstart.md",
       "redirect_url": "https://docs.microsoft.com/azure/cosmos-db/create-documentdb-dotnet",
@@ -16746,6 +16843,11 @@
       "redirect_url": "/azure/storage/blobs/data-lake-storage-upgrade",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/blobs/data-lake-storage-integrate-with-azure-services.md",
+      "redirect_url": "/azure/storage/blobs/data-lake-storage-supported-azure-services",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/sql-data-warehouse/sql-data-warehouse-get-started-load-with-azure-data-factory.md",
       "redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-load-with-data-factory",
@@ -25791,6 +25893,11 @@
       "redirect_url": "/azure/storage/common/storage-account-create",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/storage/common/authorize-active-directory-cli.md",
+      "redirect_url": "/azure/storage/common/authorize-data-operations-cli",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/storage/common/storage-account-manage.md",
       "redirect_url": "/azure/storage/common/storage-account-keys-manage",
@@ -29291,6 +29398,11 @@
       "redirect_url": "/azure/hdinsight/kafka/apache-kafka-log-analytics-operations-management",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/hdinsight/kafka/apache-kafka-byok.md",
+      "redirect_url": "/azure/hdinsight/disk-encryption",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/hdinsight/hdinsight-apache-kafka-connect-vpn-gateway.md",
       "redirect_url": "/azure/hdinsight/kafka/apache-kafka-connect-vpn-gateway",
@@ -34881,6 +34993,76 @@
       "redirect_url": "/azure/cognitive-services/academic-knowledge/home",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/home.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/introduction",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/QueryExpressionSyntax.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-query-expression-syntax",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/EntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/AffiliationEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-affiliation-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/AuthorEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-author-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/ConferenceInstanceEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-conference-instance-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/ConferenceSeriesEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-conference-series-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/FieldsOfStudyEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-field-of-study-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/JournalEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-journal-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/PaperEntityAttributes.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-paper-entity-attributes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/CalcHistogramMethod.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-calchistogram-method",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/EvaluateMethod.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-evaluate-method",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/InterpretMethod.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-interpret-method",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/academic-knowledge/SimilarityMethod.md",
+      "redirect_url": "https://docs.microsoft.com/academic-services/project-academic-knowledge/reference-similarity-method",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/entitylinking/index.md",
       "redirect_url": "/azure/cognitive-services/text-analytics",
@@ -41495,7 +41677,7 @@
       "source_path": "articles/azure-monitor/log-query/log-query-performance.md",
       "redirect_url": "/azure/azure-monitor/log-query/query-optimization",
       "redirect_document_id": false
-    },   
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-automated-ml.md",
       "redirect_url": "/azure/machine-learning/service/concept-automated-ml",
@@ -48950,7 +49132,7 @@
     {
       "source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
       "redirect_url": "/azure/azure-monitor/overview",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md",
@@ -48960,7 +49142,7 @@
     {
       "source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
       "redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/container-instances/container-instances-jenkins.md",

articles/active-directory-b2c/access-tokens.md

@@ -2,14 +2,14 @@
 title: Request an access token - Azure Active Directory B2C | Microsoft Docs
 description: Learn how to request an access token from Azure Active Directory B2C.
 services: active-directory-b2c
-author: mmacy
+author: msmimart
 manager: celestedg
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
 ms.date: 04/16/2019
-ms.author: marsma
+ms.author: mimart
 ms.subservice: B2C
 
 ---

articles/active-directory-b2c/active-directory-technical-profile.md

@@ -3,14 +3,14 @@ title: Define an Azure AD technical profile in a custom policy
 titleSuffix: Azure AD B2C
 description: Define an Azure Active Directory technical profile in a custom policy in Azure Active Directory B2C.
 services: active-directory-b2c
-author: mmacy
+author: msmimart
 manager: celestedg
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
 ms.date: 02/13/2020
-ms.author: marsma
+ms.author: mimart
 ms.subservice: B2C
 ---
 

articles/active-directory-b2c/add-native-application.md

@@ -2,10 +2,10 @@
 title: Add a native client application - Azure Active Directory B2C | Microsoft Docs
 description: Learn how to add a native client application to your Active Directory B2C tenant.
 services: active-directory-b2c
-author: mmacy
+author: msmimart
 manager: celestedg
 
-ms.author: marsma
+ms.author: mimart
 ms.date: 02/04/2019
 ms.custom: mvc
 ms.topic: conceptual

articles/active-directory-b2c/add-web-application.md

@@ -2,10 +2,10 @@
 title: Add a web API application - Azure Active Directory B2C | Microsoft Docs
 description: Learn how to add a web API application to your Active Directory B2C tenant.
 services: active-directory-b2c
-author: mmacy
+author: msmimart
 manager: celestedg
 
-ms.author: marsma
+ms.author: mimart
 ms.date: 04/16/2019
 ms.custom: mvc
 ms.topic: conceptual