fix merge conflicts and pull down master

Author: v-geberr

.openpublishing.redirection.json

@@ -5770,6 +5770,16 @@
             "redirect_url": "/azure/cosmos-db/sql-api-get-started",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/cosmos-db/sql-api-index.md",
+            "redirect_url": "/azure/cosmos-db/sql-api-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/cosmos-db/mongodb-index.md",
+            "redirect_url": "/azure/cosmos-db/mongodb-introduction",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/cosmos-db/documentdb-index.md",
             "redirect_url": "/azure/cosmos-db/sql-api-index",
@@ -21980,6 +21990,11 @@
             "source_path": "articles/cognitive-services/LUIS/App-Dashboard.md",
             "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-use-dashboard",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/cognitive-services/LUIS/Add-entities.md",
+            "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory/managed-service-identity/services-support-msi.md

@@ -26,7 +26,7 @@ The following Azure services support Managed Service Identity.
 | Azure Functions | Preview | September 2017 | [Azure portal](/azure/app-service/app-service-managed-service-identity#using-the-azure-portal)<br>[Azure Resource Manager template](/azure/app-service/app-service-managed-service-identity#using-an-azure-resource-manager-template) | [.NET](/azure/app-service/app-service-managed-service-identity#asal)<br>[REST](/azure/app-service/app-service-managed-service-identity#using-the-rest-protocol) |
 | Azure Data Factory V2 | Preview | November 2017 | [Azure portal](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity)<br>[PowerShell](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-powershell)<br>[REST](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-rest-api)<br>[SDK](~/articles/data-factory/data-factory-service-identity.md#generate-service-identity-using-sdk) |
 | Azure API Management | Preview | October 2017 | [Azure Resource Manager template](/azure/api-management/api-management-howto-use-managed-service-identity) |
-| Azure Storage | Preview | May 2018 | [Azure portal](/azure/storage/common/storage-auth-aad.md)<br>[PowerShell](/azure/storage/common/storage-auth-aad.md)<br>[Azure CLI](/azure/storage/common/storage-auth-aad.md) | [REST](https://docs.microsoft.com/rest/api/storageservices/authenticate-with-azure-active-directory)<br>[.NET](/azure/storage/common/storage-auth-aad-app.md)<br>[Java](/azure/storage/common/storage-auth-aad.md)<br>[Python](/azure/storage/common/storage-auth-aad.md) |
+| Azure Storage | Preview | May 2018 | [Azure portal](/azure/storage/common/storage-auth-aad)<br>[PowerShell](/azure/storage/common/storage-auth-aad)<br>[Azure CLI](/azure/storage/common/storage-auth-aad) | [REST](https://docs.microsoft.com/rest/api/storageservices/authenticate-with-azure-active-directory)<br>[.NET](/azure/storage/common/storage-auth-aad-app)<br>[Java](/azure/storage/common/storage-auth-aad)<br>[Python](/azure/storage/common/storage-auth-aad) |
 
 ## Azure services that support Azure AD authentication
 

articles/azure-functions/deployment-zip-push.md

@@ -13,7 +13,7 @@ ms.devlang: multiple
 ms.topic: article
 ms.tgt_pltfrm: multiple
 ms.workload: na
-ms.date: 12/06/2017
+ms.date: 05/29/2018
 ms.author: glenga
 
 ---
@@ -45,15 +45,25 @@ The .zip file that you use for push deployment must contain all of the project f
 
 When you are developing on a local computer, it's easy to create a .zip file of the function app project folder on your development computer. 
 
-However, you might have created your functions by using the editor in the Azure portal. To download your function app project from the portal: 
+However, you might have created your functions by using the editor in the Azure portal. You can download an existing function app project in one of these ways: 
 
-1. Sign in to the [Azure portal](https://portal.azure.com), and then go to your function app.
++ **From the Azure portal:** 
 
-2. On the **Overview** tab, select **Download app content**. Select your download options, and then select **Download**.     
+    1. Sign in to the [Azure portal](https://portal.azure.com), and then go to your function app.
 
-    ![Download the function app project](./media/deployment-zip-push/download-project.png)
+    2. On the **Overview** tab, select **Download app content**. Select your download options, and then select **Download**.     
 
-The downloaded .zip file is in the correct format to be republished to your function app by using .zip push deployment.
+        ![Download the function app project](./media/deployment-zip-push/download-project.png)
+
+    The downloaded .zip file is in the correct format to be republished to your function app by using .zip push deployment. The portal download can also add the files needed to open your function app directly in Visual Studio.
+
++ **Using REST APIs:** 
+
+    Use the following deployment GET API to download the files from your `<function_app>` project: 
+
+        https://<function_app>.scm.azurewebsites.net/api/zip/site/wwwroot/
+
+    Including `/site/wwwroot/` makes sure your zip file includes only the function app project files and not the entire site. If you are not already signed in to Azure, you will be asked to do so. Note that sending a POST request to the `api/zip/` API is discoraged in favor of the zip deployment method described in this topic. 
 
 You can also download a .zip file from a GitHub repository. Keep in mind that when you download a GitHub repository as a .zip file, GitHub adds an extra folder level for the branch. This extra folder level means that you can't deploy the .zip file directly as you downloaded it from GitHub. If you're using a GitHub repository to maintain your function app, you should use [continuous integration](functions-continuous-deployment.md) to deploy your app.  
 

articles/cognitive-services/LUIS/Add-example-utterances.md

@@ -16,7 +16,7 @@ ms.author: v-geberr
 
 Utterances are examples of user questions or commands. To teach Language Understanding (LUIS), you need to add [example utterances](luis-concept-utterance.md) to an [intent](luis-concept-intent.md).
 
-Generally, you add an utterance first, and then you create entities and label utterances on the intent page. If you would rather create entities first, see [Add entities](Add-entities.md).
+Generally, you add an utterance first, and then you create entities and label utterances on the intent page. If you would rather create entities first, see [Add entities](luis-how-to-add-entities.md).
 
 ## Add an utterance
 On an intent page, enter a relevant utterance you expect from your users, such as `book 2 adult business tickets to Paris tomorrow on Air France` in the text box below the intent name, and then press Enter. 
@@ -75,7 +75,7 @@ For example, if you wanted to create a list of types of drink and you selected t
 
     ![Screenshot of What type of entity do you want to create dialog box](./media/add-example-utterances/drink-list-ddl.png)
 
-    This list of drinks has only one drink type, water. You can add more drink types by labeling other utterances, or by editing the entity from the **Entities** in the left navigation. [Editing](add-entities.md#add-list-entities) the entities gives you the options of entering additional items with corresponding synonyms or [importing](add-entities.md#import-list-entity-values) a list. 
+    This list of drinks has only one drink type, water. You can add more drink types by labeling other utterances, or by editing the entity from the **Entities** in the left navigation. [Editing](luis-how-to-add-entities.md#add-list-entities) the entities gives you the options of entering additional items with corresponding synonyms or [importing](luis-how-to-add-entities.md#import-list-entity-values) a list. 
 
     See [Data Extraction](luis-concept-data-extraction.md#list-entity-data) to learn more about extracting list entities from the endpoint JSON query response. Try the [quickstart](luis-quickstart-intent-and-list-entity.md) to learn more about how to use a list entity.
 
@@ -102,7 +102,7 @@ Composite entities are created from **Entities**. You can't create a composite e
 
 Assuming the utterance, `book 2 tickets from Seattle to Cairo`, a composite utterance can return entity information of the count of tickets (2), the origin (Seattle), and destination (Cairo) locations in a single parent entity. 
 
-Follow these [steps](Add-entities.md#add-prebuilt-entity) to add the **number** prebuilt entity. After the entity is created, the `2` in the utterance is blue, indicating it is a labeled entity. Prebuilt entities are labeled by LUIS. You can't add or remove the prebuilt entity label from a single utterance. You can only add or remove all the prebuilt labels by adding or removing the prebuilt entity from the application.
+Follow these [steps](luis-how-to-add-entities.md#add-prebuilt-entity) to add the **number** prebuilt entity. After the entity is created, the `2` in the utterance is blue, indicating it is a labeled entity. Prebuilt entities are labeled by LUIS. You can't add or remove the prebuilt entity label from a single utterance. You can only add or remove all the prebuilt labels by adding or removing the prebuilt entity from the application.
 
 Follow these [steps](#add-hierarchical-entity-and-label) to create a **Location** hierarchical entity. Label the origin and destination locations in the example utterance. 
 
@@ -161,16 +161,16 @@ To remove a machine-learned entity label from an utterance, select the entity in
 ![Screenshot of Intents details page, with Remove Label highlighted](./media/add-example-utterances/remove-label.png) 
 
 ## Add prebuilt entity label
-If you add the prebuilt entities to your LUIS app, you don't need to label utterances with these entities. To learn more about prebuilt entities and how to add them, see [Add entities](Add-entities.md#add-prebuilt-entity).
+If you add the prebuilt entities to your LUIS app, you don't need to label utterances with these entities. To learn more about prebuilt entities and how to add them, see [Add entities](luis-how-to-add-entities.md#add-prebuilt-entity).
 
 ## Add regular expression entity label
-If you add the regular expression entities to your LUIS app, you don't need to label utterances with these entities. To learn more about regular expression entities and how to add them, see [Add entities](Add-entities.md#add-regular-expression-entities).
+If you add the regular expression entities to your LUIS app, you don't need to label utterances with these entities. To learn more about regular expression entities and how to add them, see [Add entities](luis-how-to-add-entities.md#add-regular-expression-entities).
 
 ## Create a pattern from an utterance
 See [Add pattern from existing utterance on intent or entity page](luis-how-to-model-intent-pattern.md#add-pattern-from-existing-utterance-on-intent-or-entity-page).
 
 ## Add pattern.any entity label
-If you add the pattern.any entities to your LUIS app, you can't label utterances with these entities. They are only valid in patterns. To learn more about pattern.any entities and how to add them, see [Add entities](Add-entities.md#add-patternany-entities).
+If you add the pattern.any entities to your LUIS app, you can't label utterances with these entities. They are only valid in patterns. To learn more about pattern.any entities and how to add them, see [Add entities](luis-how-to-add-entities.md#add-patternany-entities).
 
 <!--
 Fix this - moved to add-intents.md - how ?
@@ -190,4 +190,4 @@ After you add, edit, or remove utterances, [train](luis-how-to-train.md) and [pu
 
 ## Next steps
 
-After labeling utterances in your intents, you can now create a [composite entity](Add-entities.md).
+After labeling utterances in your intents, you can now create a [composite entity](luis-how-to-add-entities.md).

articles/cognitive-services/LUIS/Home.md

@@ -128,7 +128,7 @@ Create a [new LUIS app](LUIS-get-started-create-app.md).
 [flow]:https://docs.microsoft.com/connectors/luis/
 [entity-concept]:luis-concept-entity-types.md
 [add-intents]:Add-intents.md
-[add-entities]:Add-entities.md
+[add-entities]:luis-how-to-add-entities.md
 [authoring-apis]:https://aka.ms/luis-authoring-api
 [endpoint-apis]:https://aka.ms/luis-endpoint-apis
 [LUIS]:luis-reference-regions.md

articles/cognitive-services/LUIS/luis-concept-data-extraction.md

@@ -704,6 +704,6 @@ The LUIS endpoint can discover the same data in different entities:
 
 ## Next steps
 
-See [Add entities](Add-entities.md) to learn more about how to add entities to your LUIS app.
+See [Add entities](luis-how-to-add-entities.md) to learn more about how to add entities to your LUIS app.
 
 [LUIS]:luis-reference-regions.md

articles/cognitive-services/LUIS/luis-concept-entity-types.md

@@ -206,6 +206,6 @@ See [best practices](luis-concept-best-practices.md) for more information.
 
 Learn concepts about good [utterances](luis-concept-utterance.md). 
 
-See [Add entities](Add-entities.md) to learn more about how to add entities to your LUIS app.
+See [Add entities](luis-how-to-add-entities.md) to learn more about how to add entities to your LUIS app.
 
 [LUIS]:luis-reference-regions.md#luis-website

articles/cognitive-services/LUIS/luis-concept-prediction-score.md

@@ -55,6 +55,6 @@ If your chat bot requires a specific LUIS score to indicate confidence in an int
 
 ## Next steps
 
-See [Add entities](Add-entities.md) to learn more about how to add entities to your LUIS app.
+See [Add entities](luis-how-to-add-entities.md) to learn more about how to add entities to your LUIS app.
 
 [LUIS]:luis-reference-regions.md

articles/cognitive-services/LUIS/luis-concept-roles.md

@@ -35,4 +35,4 @@ The entity and role are surrounded in parentheses, `{}`. The entity and the role
 
 ## Next steps
 
-* Learn how to add [roles](add-entities.md#add-role-to-pattern-based-entity)
+* Learn how to add [roles](luis-how-to-add-entities.md#add-role-to-pattern-based-entity)