Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 2-speech-service-articles

Author: v-albemi

articles/azure-monitor/app/asp-net-trace-logs.md

@@ -178,11 +178,13 @@ You can, for example:
 
 ## Troubleshooting
 ### How do I do this for Java?
-Use the [Java log adapters](../../azure-monitor/app/java-trace-logs.md).
+In Java codeless instrumentation (recommended) the logs are collected out of the box, use [Java 3.0 agent](https://docs.microsoft.com/azure/azure-monitor/app/java-in-process-agent).
+
+If you are using the Java SDK, use the [Java log adapters](../../azure-monitor/app/java-trace-logs.md).
 
 ### There's no Application Insights option on the project context menu
 * Make sure that Developer Analytics Tools is installed on the development machine. At Visual Studio **Tools** > **Extensions and Updates**, look for **Developer Analytics Tools**. If it isn't on the **Installed** tab, open the **Online** tab and install it.
-* This might be a project type that Devloper Analytics Tools doesn't support. Use [manual installation](#manual-installation).
+* This might be a project type that Developer Analytics Tools doesn't support. Use [manual installation](#manual-installation).
 
 ### There's no log adapter option in the configuration tool
 * Install the logging framework first.

articles/cognitive-services/QnAMaker/qna-maker-encryption-of-data-at-rest.md

@@ -50,6 +50,11 @@ The QnA Maker service uses CMK from the Azure Search service. Follow these steps
 
 Customer-managed keys are available in all Azure Search regions.
 
+## Encryption of data in transit
+
+QnA Maker portal runs in the user's browser. Every action trigger a direct call to the respective cognitive service API. Hence, QnA Maker is compliant for data in transit.
+However, as the QnA Maker portal service is hosted in West-US, it is still not ideal for non-US customers. 
+
 ## Next steps
 
 * [Encryption in Azure Search using CMKs in Azure Key Vault](https://docs.microsoft.com/azure/search/search-security-manage-encryption-keys)