Merge remote-tracking branch 'refs/remotes/MicrosoftDocs/master' into nitinme-retire-services

Author: nitinme

.openpublishing.redirection.json

@@ -45220,6 +45220,16 @@
       "redirect_url": "/azure/storage/common/storage-security-guide",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/blobs/data-lake-storage-quickstart-create-account.md",
+      "redirect_url": "/azure/storage/common/storage-account-create",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/data-lake-storage-how-to-set-permissions-storage-explorer.md",
+      "redirect_url": "/azure/storage/blobs/data-lake-storage-explorer",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security/fundamentals/global-admin.md",
       "redirect_url": "/azure/active-directory/authentication/multi-factor-authentication",

articles/active-directory/hybrid/reference-connect-version-history.md

@@ -80,6 +80,8 @@ This version fixes a bug where some servers that were auto-upgraded from a previ
 
 Under certain circumstances, servers that were auto upgraded to version 1.4.18.0 did not re-enable Self-service password reset and Password Writeback after the upgrade was completed. This auto upgrade release fixes that issue and re-enables Self-service password reset and Password Writeback.
 
+We fixed a bug in the sync errors compression utility that was not handling surrogate characters correctly.
+
 ## 1.4.18.0
 
 >[!WARNING]

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

@@ -371,7 +371,7 @@ Windows Defender ATP and EDR | Assign roles<br>Manage machine groups<br>Configur
 
 ### [Security operator](#security-operator-permissions)
 
-Users with this role can manage alerts and have global read-only access on security-related feature, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management and Office 365 Security & Compliance Center. More information about Office 365 permissions is available at [Permissions in the Office 365 Security & Compliance Center](https://docs.microsoft.com/office365/securitycompliance/permissions-in-the-security-and-compliance-center).
+Users with this role can manage alerts and have global read-only access on security-related features, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management and Office 365 Security & Compliance Center. More information about Office 365 permissions is available at [Permissions in the Office 365 Security & Compliance Center](https://docs.microsoft.com/office365/securitycompliance/permissions-in-the-security-and-compliance-center).
 
 In | Can do
 --- | ---

articles/aks/http-application-routing.md

@@ -45,7 +45,7 @@ az aks enable-addons --resource-group myResourceGroup --name myAKSCluster --addo
 After the cluster is deployed or updated, use the [az aks show][az-aks-show] command to retrieve the DNS zone name. This name is needed to deploy applications to the AKS cluster.
 
 ```azurecli
-az aks show --resource-group myResourceGroup --name myAKSCluster --query addonProfiles.httpapplicationrouting.config.HTTPApplicationRoutingZoneName -o table
+az aks show --resource-group myResourceGroup --name myAKSCluster --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName -o table
 ```
 
 Result

articles/cognitive-services/QnAMaker/troubleshooting.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: qna-maker
 ms.topic: article
-ms.date: 09/26/2019
+ms.date: 01/23/2020
 ms.author: diberry
 ms.custom: seodec18
 ---
@@ -21,7 +21,7 @@ The curated list of the most frequently asked questions regarding the QnA Maker
 ## How to get the QnAMaker service endpoint
 
 QnAMaker service endpoint is useful for debugging purposes when you contact QnAMaker Support or UserVoice. The endpoint is a URL in this form: https://your-resource-name.azurewebsites.net.
-	
+
 1. Go to your QnAMaker service (resource group) in the [Azure portal](https://portal.azure.com)
 
     ![QnAMaker Azure resource group in Azure portal](./media/qnamaker-how-to-troubleshoot/qnamaker-azure-resourcegroup.png)
@@ -33,21 +33,21 @@ QnAMaker service endpoint is useful for debugging purposes when you contact QnAM
 1. The endpoint URL is available in the Overview section
 
     ![QnAMaker endpoint](./media/qnamaker-how-to-troubleshoot/qnamaker-azure-gethostname.png)
-    
+
 
 ## Use the Help bot in the QnA Maker portal
 
-QnA Maker provides a **Help** bot within the QnA Maker portal to help you. The help bot is available on every web page. The bot uses QnA Maker to provide answers and provides the [C# Bot Framework code project](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/qnamaker-support) to the bot so you can quickly get up and running with your own answer bot. 
+QnA Maker provides a **Help** bot within the QnA Maker portal to help you. The help bot is available on every web page. The bot uses QnA Maker to provide answers and provides the [C# Bot Framework code project](https://github.com/microsoft/BotBuilder-Samples/tree/master/experimental/qnamaker-support) to the bot so you can quickly get up and running with your own answer bot.
 
 ![![QnA Maker provides a **Help** bot within the QnA Maker portal to help you.](./media/qnamaker-faq/use-qna-maker-help-bot-to-learn-qna-maker-service.png)](./media/qnamaker-faq/use-qna-maker-help-bot-to-learn-qna-maker-service.png#lightbox)
 
 ## Manage the knowledge base
 
-### I accidentally deleted a part of my QnA Maker, what should I do? 
+### I accidentally deleted a part of my QnA Maker, what should I do?
 
 Do not delete any of the Azure services created along with the QnA Maker resource such as Search or Web App. These are necessary for QnA Maker to work, if you delete one, QnA Maker will stop working correctly.
 
-All deletes are permanent, including question and answer pairs, files, URLs, custom questions and answers, knowledge bases, or Azure resources. Make sure you export your knowledge base from the **Settings** page before deleting any part of your knowledge base. 
+All deletes are permanent, including question and answer pairs, files, URLs, custom questions and answers, knowledge bases, or Azure resources. Make sure you export your knowledge base from the **Settings** page before deleting any part of your knowledge base.
 
 ### Why is my URL(s)/file(s) not extracting question-answer pairs?
 
@@ -65,7 +65,7 @@ You haven't created any QnA Maker services in Azure yet. Read [here](./How-To/se
 
 Sharing works at the level of a QnA Maker service, that is, all knowledge bases in the service will be shared. Read [here](./How-To/collaborate-knowledge-base.md) how to collaborate on a knowledge base.
 
-### Can you share a knowledge base with a contributor that is not in the same AAD tenant, to modify a knowledge base? 
+### Can you share a knowledge base with a contributor that is not in the same AAD tenant, to modify a knowledge base?
 
 Sharing is based on Azure role-based access control (RBAC). If you can share _any_ resource in Azure with another user, you can also share QnA Maker.
 
@@ -97,9 +97,13 @@ Every edit operation, whether in a table update, test, or setting, needs to be s
 
 ### Does the knowledge base support rich data or multimedia?
 
-The knowledge base supports Markdown. However, the auto-extraction from URLs has limited HTML-to-Markdown conversion capability. If you want to use full-fledged Markdown, you can modify your content directly in the table, or upload a knowledge base with the rich content.
+#### Multimedia auto-extraction for files and URLs
+
+* URLS - limited HTML-to-Markdown conversion capability.
+* Files - not supported
 
-Multimedia, such as images and videos, is not supported at this time.
+#### Answer text in markdown
+Once QnA sets are in the knowledge base, you can edit an answer's markdown text to include links to media available from public URLs.
 
 ### Does QnA Maker support non-English languages?
 
@@ -109,15 +113,15 @@ If you have content from multiple languages, be sure to create a separate servic
 
 ## Manage service
 
-### When should I restart my app service? 
+### When should I restart my app service?
 
 Refresh your app service when the caution icon is next to the version value for the knowledge base in the **Endpoint keys** table on the **User Settings** [page](https://www.qnamaker.ai/UserSettings).
 
 ### I deleted my existing Search service. How can I fix this?
 
-If you delete an Azure Cognitive Search index, the operation is final and the index cannot be recovered. 
+If you delete an Azure Cognitive Search index, the operation is final and the index cannot be recovered.
 
-### I deleted my `testkb` index in my Search service. How can I fix this? 
+### I deleted my `testkb` index in my Search service. How can I fix this?
 
 Your old data can't be recovered. Create a new QnA Maker resource and create your knowledge base again.
 
@@ -139,18 +143,18 @@ The disk space for your app service might be full. Steps to fix your disk space:
 
 1. In the [Azure portal](https://portal.azure.com), select your QnA Maker's App service, then stop the service.
 1. While still on the App service, select **Development Tools**, then **Advanced Tools**, then **Go**. This opens a new browser window.
-1. Select **Debug console**, then **CMD** to open a command line tool. 
+1. Select **Debug console**, then **CMD** to open a command line tool.
 1. Navigate to the _site/wwwroot/Data/QnAMaker/_ directory.
-1. Remove all the folders whose name begins with `rd`. 
+1. Remove all the folders whose name begins with `rd`.
 
     **Do not delete** the following:
 
     * KbIdToRankerMappings.txt file
     * EndpointSettings.json file
-    * EndpointKeys folder 
+    * EndpointKeys folder
 
 1. Start the App service.
-1. Access your knowledge base to verify it works now. 
+1. Access your knowledge base to verify it works now.
 
 
 ## Integrate with other services including Bots
@@ -169,13 +173,13 @@ You need to have the following information about your knowledge base:
 
 * Knowledge base ID.
 * Knowledge base's published endpoint custom subdomain name, known as `host`, found on **Settings** page after you publish.
-* Knowledge base's published endpoint key - found on **Settings** page after you publish. 
+* Knowledge base's published endpoint key - found on **Settings** page after you publish.
 
-With this information, go to your bot's app service in the Azure portal. Under **Settings -> Configuration -> Application settings**, change those values.  
+With this information, go to your bot's app service in the Azure portal. Under **Settings -> Configuration -> Application settings**, change those values.
 
-The knowledge base's endpoint key is labeled `QnAAuthkey` in the ABS service. 
+The knowledge base's endpoint key is labeled `QnAAuthkey` in the ABS service.
 
-### Can two or more client applications share a knowledge base? 
+### Can two or more client applications share a knowledge base?
 
 Yes, the knowledge base can be queried from any number of clients. If the response from the knowledge base appears to be slow or time out, consider upgrading the service tier for the app service associated with the knowledge base.
 
@@ -188,6 +192,6 @@ Follow these steps to embed the QnA Maker service as a web-chat control in your
 
 ## Data storage
 
-### What data is stored and where is it stored? 
+### What data is stored and where is it stored?
 
-When you create your QnA Maker service, you selected an Azure region. Your knowledge bases and log files are stored in this region. 
+When you create your QnA Maker service, you selected an Azure region. Your knowledge bases and log files are stored in this region.

articles/iot-edge/quickstart.md

@@ -14,7 +14,7 @@ ms.custom: mvc
 
 # Quickstart: Deploy your first IoT Edge module to a virtual Windows device
 
-Test out Azure IoT Edge in this quickstart by deploying containerized code to a virtual IoT Edge device. IoT Edge allows you to remotely manage code on your devices so that you can send more of your workloads to the edge. For this quickstart, we recommend using an Azure virtual machine for your IoT Edge device, which allows you to quickly create a test machine, install the prerequisites, and then delete it when you're finished.
+Try out Azure IoT Edge by deploying containerized code to a virtual IoT Edge device. IoT Edge allows you to remotely manage code on your devices so that you can send more of your workloads to the edge. For this quickstart, we recommend using an Azure virtual machine for your IoT Edge device. Using a virtual machine allows you to quickly create a test machine, install the prerequisites, and then delete it when you're finished.
 
 In this quickstart you learn how to:
 
@@ -46,7 +46,7 @@ Cloud resources:
 * A resource group to manage all the resources you use in this quickstart.
 
    ```azurecli-interactive
-   az group create --name IoTEdgeResources --location westus2 
+   az group create --name IoTEdgeResources --location westus2
    ```
 
 IoT Edge device:
@@ -154,7 +154,7 @@ Use PowerShell to download and install the IoT Edge runtime. Use the device conn
 
 5. Run PowerShell as an administrator again.
 
-6. The **Initialize-IoTEdge** command configures the IoT Edge runtime on your machine. The command defaults to manual provisioning with Windows containers. 
+6. The **Initialize-IoTEdge** command configures the IoT Edge runtime on your machine. The command defaults to manual provisioning with Windows containers.
 
    ```powershell
    . {Invoke-WebRequest -useb aka.ms/iotedge-win} | Invoke-Expression; `
@@ -241,7 +241,7 @@ az group delete --name IoTEdgeResources
 
 In this quickstart, you created an IoT Edge device and used the Azure IoT Edge cloud interface to deploy code onto the device. Now, you have a test device generating raw data about its environment.
 
-The next step is to set up your local development environment so that you can start creating IoT Edge modules that run your business logic. 
+The next step is to set up your local development environment so that you can start creating IoT Edge modules that run your business logic.
 
 > [!div class="nextstepaction"]
 > [Start developing IoT Edge modules for Windows devices](tutorial-develop-for-windows.md)