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

Author: daveba

articles/active-directory/authentication/concept-sspr-howitworks.md

@@ -151,6 +151,8 @@ Custom security questions are not localized for different locales. All custom qu
 
 The maximum length of a custom security question is 200 characters.
 
+To view the password reset portal and questions in a different localized language append "?mkt=<Locale>" to the end of the password reset URL with the example that follows localizing to Spanish [https://passwordreset.microsoftonline.com/?mkt=es-us](https://passwordreset.microsoftonline.com/?mkt=es-us).
+
 ### Security question requirements
 
 * The minimum answer character limit is three characters.

articles/aks/networking-overview.md

@@ -35,15 +35,41 @@ Nodes in an AKS cluster configured for Advanced networking use the [Azure Contai
 Advanced networking provides the following benefits:
 
 * Deploy your AKS cluster into an existing VNet, or create a new VNet and subnet for your cluster.
-* Every pod in the cluster is assigned an IP address in the VNet, and can directly communicate with other pods in the cluster, and other VMs in the VNet.
+* Every pod in the cluster is assigned an IP address in the VNet, and can directly communicate with other pods in the cluster, and other nodes in the VNet.
 * A pod can connect to other services in a peered VNet, and to on-premises networks over ExpressRoute and site-to-site (S2S) VPN connections. Pods are also reachable from on-premises.
 * Expose a Kubernetes service externally or internally through the Azure Load Balancer. Also a feature of Basic networking.
 * Pods in a subnet that have service endpoints enabled can securely connect to Azure services, for example Azure Storage and SQL DB.
 * Use user-defined routes (UDR) to route traffic from pods to a Network Virtual Appliance.
 * Pods can access resources on the public Internet. Also a feature of Basic networking.
 
 > [!IMPORTANT]
-> Each node in an AKS cluster configured for Advanced networking can host a maximum of **30 pods**. Each VNet provisioned for use with the Azure CNI plugin is limited to **4096 IP addresses** (/20).
+> Each node in an AKS cluster configured for Advanced networking can host a maximum of **30 pods**. Each VNet provisioned for use with the Azure CNI plugin is limited to **4096 configured IP addresses**.
+
+## Advanced networking prerequisites
+
+* The VNet for the AKS cluster must allow outbound internet connectivity.
+* Do not create more than one AKS cluster in the same subnet.
+* Advanced networking for AKS does not support VNets that use Azure Private DNS Zones.
+* AKS clusters may not use `169.254.0.0/16`, `172.30.0.0/16`, or `172.31.0.0/16` for the Kubernetes service address range.
+* The service principal used for the AKS cluster must have `Owner` permissions to the resource group containing the existing VNet.
+
+## Plan IP addressing for your cluster
+
+Clusters configured with Advanced networking require additional planning. The size of your VNet and its subnet must accommodate both the number of pods you plan to run as well as the number of nodes for the cluster.
+
+IP addresses for the pods and the cluster's nodes are assigned from the specified subnet within the VNet. Each node is configured with a primary IP, which is the IP of the node and 30 additional IP addresses pre-configured by Azure CNI that are assigned to pods scheduled to the node. When you scale out your cluster, each node is similarly configured with IP addresses from the subnet.
+
+The IP address plan for an AKS cluster consists of a VNet, at least one subnet for nodes and pods, and a Kubernetes service address range.
+
+| Address range / Azure resource | Limits and sizing |
+| --------- | ------------- |
+| Virtual network | Azure VNet can be as large as /8 but may only have 4096 configured IP addresses. |
+| Subnet | Must be large enough to accommodate the nodes and Pods. To calculate your minimum subnet size: (Number of nodes) + (Number of nodes * Pods per node). For a 50 node cluster: (50) + (50 * 30) = 1,550, your subnet would need to be a /21 or larger. |
+| Kubernetes service address range | This range should not be used by any network element on or connected to this VNet. Service address CIDR must be smaller than /12. |
+| Kubernetes DNS service IP address | IP address within the Kubernetes service address range that will be used by cluster service discovery (kube-dns). |
+| Docker bridge address | IP address (in CIDR notation) used as the Docker bridge IP address on nodes. Default of 172.17.0.1/16. |
+
+As mentioned previously, each VNet provisioned for use with the Azure CNI plugin is limited to **4096 configured IP addresses**. Each node in a cluster configured for Advanced networking can host a maximum of **30 pods**.
 
 ## Configure advanced networking
 
@@ -63,14 +89,6 @@ The following screenshot from the Azure portal shows an example of configuring t
 
 ![Advanced networking configuration in the Azure portal][portal-01-networking-advanced]
 
-## Plan IP addressing for your cluster
-
-Clusters configured with Advanced networking require additional planning. The size of your VNet and its subnet must accommodate the number of pods you plan to run simultaneously in the cluster, as well as your scaling requirements.
-
-IP addresses for the pods and the cluster's nodes are assigned from the specified subnet within the VNet. Each node is configured with a primary IP, which is the IP of the node itself, and 30 additional IP addresses pre-configured by Azure CNI that are assigned to pods scheduled to the node. When you scale out your cluster, each node is similarly configured with IP addresses from the subnet.
-
-As mentioned previously, each VNet provisioned for use with the Azure CNI plugin is limited to **4096 IP addresses** (/20). Each node in a cluster configured for Advanced networking can host a maximum of **30 pods**.
-
 ## Frequently asked questions
 
 The following questions and answers apply to the **Advanced** networking configuration.
@@ -89,7 +107,7 @@ The following questions and answers apply to the **Advanced** networking configu
 
 * *Is the maximum number of pods deployable to a node configurable?*
 
-  By default, each node can host a maximum of 30 pods. You can currently change the maximum value only by modifying the `maxPods` property when deploying a cluster with a Resource Manager template.
+  By default, each node can host a maximum of 30 pods. You can change the maximum value only by modifying the `maxPods` property when deploying a cluster with a Resource Manager template.
 
 * *How do I configure additional properties for the subnet that I created during AKS cluster creation? For example, service endpoints.*
 

articles/cognitive-services/LUIS/luis-quickstart-intent-and-hier-entity.md

@@ -1,26 +1,35 @@
 ---
-title: Create a LUIS app to get location data - Azure | Microsoft Docs 
-description: Learn how to create a simple LUIS app using intents and a hierarchical entity to extract data in this quickstart. 
+title: Tutorial to create a LUIS app to get location data - Azure | Microsoft Docs 
+description: In this tutorial, learn how to create a simple LUIS app using intents and a hierarchical entity to extract data. 
 services: cognitive-services
 author: v-geberr
 manager: kaiqb 
 
 ms.service: cognitive-services
 ms.component: luis
-ms.topic: quickstart
+ms.topic: tutorial
 ms.date: 03/27/2018
 ms.author: v-geberr
 #Customer intent: As a new user, I want to understand how and why to use the hierarchical entity. 
 
 --- 
 
-# Quickstart: Create app that uses hierarchical entity
-In this quickstart, create an app that demonstrates how to find related pieces of data based on context. 
+# Tutorial: Create app that uses hierarchical entity
+In this tutorial, create an app that demonstrates how to find related pieces of data based on context. 
+
+<!-- green checkmark -->
+> [!div class="checklist"]
+> * Understand hierarchical entities and contextually learned children 
+> * Create new LUIS app for travel domain with Bookflight intent
+> * Add _None_ intent and add example utterances
+> * Add location hierarchical entity with origin and destination children
+> * Train, and publish app
+> * Query endpoint of app to see LUIS JSON response including hierarchical children 
 
 For this article, you need a free [LUIS][LUIS] account in order to author your LUIS application.
 
 ## Purpose of the app with this entity
-This app determine if a user wants to book a flight. It uses the hierarchical entity to determine the locations, origin city and destination city, within the user's text. 
+This app determines if a user wants to book a flight. It uses the hierarchical entity to determine the locations, origin city, and destination city, within the user's text. 
 
 The hierarchical entity is a good fit for this type of data because the two pieces of data:
 
@@ -34,9 +43,9 @@ The purpose of the **hierarchical** entity is to find related data within the ut
 1 ticket from Seattle to Cairo`
 ```
 
-The utterance has two locations specified. One is the origin city, Seattle, and the other is the destination city, Cairo. This cities are both important to book a flight. While they could be found using simple entities, they are related to each other and will frequently be found in the same utterance. Therefore, it makes sense that they are both grouped as children of a hierarchical entity, **"Location"**. 
+The utterance has two locations specified. One is the origin city, Seattle, and the other is the destination city, Cairo. These cities are both important to book a flight. While they could be found using simple entities, they are related to each other and will frequently be found in the same utterance. Therefore, it makes sense that they are both grouped as children of a hierarchical entity, **"Location"**. 
 
-As machine-learned entities, the app will need example utterances with the origin and destination cities labeled. This teaches LUIS where the entities are in utterances, how long they are and the words around them. 
+As machine-learned entities, the app needs example utterances with the origin and destination cities labeled. This teaches LUIS where the entities are in utterances, how long they are and the words around them. 
 
 ## App intents
 The intents are categories of what the user wants. This app has two intents: BookFlight and None. The [None](luis-concept-intent.md#none-intent-is-fallback-for-app) intent is purposeful, to indicate anything outside the app.  
@@ -219,10 +228,10 @@ LUIS is done with this request. The calling application, such as a chat bot, can
 When no longer needed, delete the LUIS app. To do so, select the three dot menu (...) to the right of the app name in the app list, select **Delete**. On the pop-up dialog **Delete app?**, select **Ok**.
 
 ## Next steps
+> [!div class="nextstepaction"] 
+> [Learn how to add a regular expression entity](luis-quickstart-intents-regex-entity.md) 
 
-[Learn how to add a regular expression entity](luis-quickstart-intents-regex-entity.md). 
-
-Add the **number** [prebuilt entity](luis-how-to-add-entities.md#add-prebuilt-entity) to extract the number of seats. 
+Add the **number** [prebuilt entity](luis-how-to-add-entities.md#add-prebuilt-entity) to extract the number of seats for a flight. 
 
 Add the **datetimeV2** [prebuilt entity](luis-how-to-add-entities.md#add-prebuilt-entity) to extract the date information such as `Friday`.
 

articles/cognitive-services/LUIS/toc.yml

@@ -21,8 +21,6 @@
         href: luis-quickstart-primary-and-secondary-data.md
       - name: List entity
         href: luis-quickstart-intent-and-list-entity.md
-      - name: Hierarchical entity
-        href: luis-quickstart-intent-and-hier-entity.md
       - name: Regular expresion entity
         href: luis-quickstart-intents-regex-entity.md
       - name: KeyPhrase entity
@@ -31,6 +29,10 @@
         href: luis-quickstart-intent-and-sentiment-analysis.md
 - name: Tutorials
   items: 
+  - name: Get data from entity
+    items: 
+      - name: Hierarchical entity
+        href: luis-quickstart-intent-and-hier-entity.md
   - name: Use APIs
     items: 
     - name: Get utterance prediction with endpoint query