Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into dec-sec

Author: TerryLanfear

articles/active-directory/fundamentals/whats-new.md

@@ -183,11 +183,9 @@ For more information about this update, see [Azure AD Connect: Version release h
 
 We're updating the acceptance string in the TOU end-user UI.
 
-**Current text.** In order to access [tenantName] resources, you must accept the terms of use.
-**New text.** In order to access [tenantName] resource, you must read the terms of use.
+**Current text.** In order to access [tenantName] resources, you must accept the terms of use.<br>**New text.** In order to access [tenantName] resource, you must read the terms of use.
 
-**Current text:** Choosing to accept means that you agree to all of the above terms of use.
-**New text:** Please click Accept to confirm that you have read and understood the terms of use.
+**Current text:** Choosing to accept means that you agree to all of the above terms of use.<br>**New text:** Please click Accept to confirm that you have read and understood the terms of use.
 
 ---
 

articles/active-directory/user-help/index.md

@@ -18,6 +18,12 @@ ms.author: lizross
 
 We've created this content to help you set up and use security info, two-step verification, to learn how to reset your own passwords, to set up and join your Azure Active Directory devices, and to set up and use the Microsoft Authenticator app and the My Apps portal.
 
+|  |
+|--|
+|This content is intended for users. If you're an administrator, you can find more information about how to set up and manage your Azure Active Directory (Azure AD) environment in the [Azure Active Directory Documentation](https://docs.microsoft.com/azure/active-directory).|
+|  |
+
+
 <ul class="panelContent cardsF">
     <li>
         <div class="cardSize">

articles/active-directory/user-help/microsoft-authenticator-app-backup-and-recovery.md

@@ -44,12 +44,12 @@ Requiring you to sign in to both accounts together provides stronger security fo
 ## Recover your account credentials on your new device
 You can recover your account credentials from your iCloud account, using the same Microsoft recovery account you set up when you backed up your information.
 
-**To recover your information**
+### To recover your information
 1.	On your iOS device, open the Microsoft Authenticator app, and select **Begin recovery** from the bottom of the screen.
 
     ![Microsoft Authenticator app, showing where to click Begin recovery](./media/microsoft-authenticator-app-backup-and-recovery/backup-and-recovery-begin-recovery.png)
 
-2.	sign in to your recovery account, using the same personal Microsoft account you used during the backup process.
+2.	Sign in to your recovery account, using the same personal Microsoft account you used during the backup process.
 
     Your account credentials are recovered to the new device.
 
@@ -60,7 +60,7 @@ If you use push notifications with your personal, work, or school accounts, you'
 
 For personal Microsoft accounts, you can prove your identity by entering your password along with an alternate email or phone number. For work or school accounts, you must scan a QR code given to you by your account provider.
 
-**To provide additional verification for personal accounts**
+### To provide additional verification for personal accounts
 1.	In the **Accounts** screen of the Microsoft Authenticator app, select the drop-down arrow next to the account you want to recover.
 
     ![Microsoft Authenticator app, showing the available accounts with their associated drop-down arrows](./media/microsoft-authenticator-app-backup-and-recovery/backup-and-recovery-arrow.png)
@@ -69,7 +69,7 @@ For personal Microsoft accounts, you can prove your identity by entering your pa
 
     ![Microsoft Authenticator app, allowing you to enter your sign-in info](./media/microsoft-authenticator-app-backup-and-recovery/backup-and-recovery-sign-in.png)
 
-**To provide additional verification for work or school accounts**
+### To provide additional verification for work or school accounts
 1.	In the **Accounts** screen of the Microsoft Authenticator app, select the drop-down arrow next to the account you want to recover.
 
     ![Microsoft Authenticator app, showing the available accounts with their associated drop-down arrows](./media/microsoft-authenticator-app-backup-and-recovery/backup-and-recovery-additonal-accts.png)
@@ -79,7 +79,7 @@ For personal Microsoft accounts, you can prove your identity by entering your pa
     ![Microsoft Authenticator app, allowing you to scan your QR code](./media/microsoft-authenticator-app-backup-and-recovery/backup-and-recovery-scan-qr-code.png)
 
     >[!NOTE]
-    >For more info about how to get a QR code, see the [Get started with the Microsoft Authenticator app](https://docs.microsoft.com/en-us/azure/multi-factor-authentication/end-user/microsoft-authenticator-app-how-to) article.
+    >For more info about how to get a QR code, see the [How to add accounts section of the Get started with the Microsoft Authenticator app](https://docs.microsoft.com/azure/active-directory/user-help/microsoft-authenticator-app-how-to#add-accounts-to-the-app) article.
 
 ## Troubleshooting backup and recovery problems
 There are a few reasons why your backup might not be available:

articles/active-directory/user-help/microsoft-authenticator-app-phone-signin-faq.md

@@ -1,6 +1,6 @@
 ---
-title: Microsoft Authenticator phone sign-in - Azure and Microsoft accounts | Microsoft Docs
-description: Use your phone to sign in to your Microsoft account instead of typing your password. This article answers FAQs about this feature.
+title: Microsoft Authenticator phone sign-in - Azure Active Directory | Microsoft Docs
+description: Provides detailed info and step-by-step instructions about how to use your phone to sign in to your work and school and personal Microsoft accounts, instead of typing your password.
 services: active-directory
 author: eross-msft
 manager: mtillman
@@ -36,7 +36,7 @@ If your organization uses Azure Active Directory for identity management and aut
 
 - **If you use the Microsoft Authenticator app for your personal account, but not for your work or school account.** Follow your organization’s two-step verification instructions, and then turn on phone sign-in. For more information, see [Get started with the Microsoft Authenticator app](microsoft-authenticator-app-how-to.md)
 
-### To use phone sign-in to sign into your work or school account
+### To use phone sign-in to sign in to your work or school account
 
 1.	Sign in to your work or school account, as normal.
 
@@ -64,7 +64,7 @@ New accounts are automatically turned on, so you can immediately start using pho
 >[!NOTE]
 >To help protect your account, the app requires a PIN or biometric lock on your device. If you keep your phone unlocked, the app requires you to set up a security lock before turning on phone sign-in.
 
-### To use phone sign-in to sign into your personal account
+### To use phone sign-in to sign in to your personal account
 
 1.	Go to your personal Microsoft account sign-in page, and then instead of typing your password, select the **Use an app instead** link.
 

articles/active-directory/user-help/user-help-security-info-overview.md

@@ -24,7 +24,7 @@ ms.author: lizross
 
 Set up your two-step verification and password reset info in **Security info**. After you initially set up your security info, you won't have to do it again. However, you can edit your info and change the default method at any time.
 
-You and add any of the following methods, including:
+You can add any of the following methods, including:
 
 |Article |Description |
 |------|------------|
@@ -35,4 +35,4 @@ You and add any of the following methods, including:
 |[Set up security info to use pre-defined security questions](security-info-setup-questions.md)|Describes how to use security questions to help you reset your password.|
 |[Manage app passwords](security-info-app-passwords.md)|Describes how to set up app passwords using security info.|
 |[Manage your security info](security-info-manage-settings.md)|Describes how to update your security info and work with your app passwords.|
-|[How to sign in](user-help-sign-in.md)|Describes how to sign in using your specified method.|
+|[How to sign in](user-help-sign-in.md)|Describes how to sign in using your specified method.|

articles/azure-resource-manager/programmatically-create-subscription.md

@@ -2,8 +2,8 @@
 title: Programmatically create Azure Enterprise subscriptions| Microsoft Docs
 description: Learn how to create additional Azure Enterprise or Enterprise Dev/Test subscriptions programmatically.
 services: azure-resource-manager
-author: jlian
-manager: jlian
+author: adpick
+manager: adpick
 editor: ''
 
 ms.assetid: 
@@ -13,7 +13,7 @@ ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: na
 ms.date: 06/05/2018
-ms.author: jlian
+ms.author: adpick
 ---
 
 # Programmatically create Azure Enterprise subscriptions (preview)
@@ -24,9 +24,11 @@ When you create an Azure subscription from this API, that subscription is govern
 
 ## Prerequisites
 
-* Your account must be an Account Owner in an Azure EA enrollment. If not, ask your Enrollment Administrator to [add you as an Account Owner using the EA portal](https://ea.azure.com/helpdocs/addNewAccount) (log-in required). Follow the instructions in the invitation email you receive to manually create an initial subscription. Confirm account ownership and manually create an initial EA subscription before proceeding to the next step. Just adding the account to the enrollment isn't enough.
+You must have an Owner or Contributor role on the Enrollment Account you wish to create subscriptions under. There are two ways to get these roles:
 
-* If you want to use a service principal to create the EA subscription, you must [grant that service principal the ability to create subscriptions](grant-access-to-create-subscription.md).
+* Your Enrollment Administrator can [make you an Account Owner](https://ea.azure.com/helpdocs/addNewAccount) (log-in required) which makes you an Owner of the Enrollment Account. Follow the instructions in the invitation email you receive to manually create an initial subscription. Confirm account ownership and manually create an initial EA subscription before proceeding to the next step. Just adding the account to the enrollment isn't enough.
+
+* An existing Owner of the Enrollment Account can [grant you access](grant-access-to-create-subscription.md). Similarly, if you want to use a service principal to create the EA subscription, you must [grant that service principal the ability to create subscriptions](grant-access-to-create-subscription.md).
 
 ## Find accounts you have access to
 

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

@@ -7,7 +7,7 @@ manager: cjgronlund
 ms.service: cognitive-services
 ms.component: language-understanding
 ms.topic: article
-ms.date: 05/07/2018
+ms.date: 07/26/2018
 ms.author: diberry
 ---
 
@@ -32,6 +32,8 @@ Every utterance prediction returns a top-scoring intent. This is a numerical com
 
 If you are concerned about proximity of top scores, you should return the score for all intents. You can either add utterances to the two intents that indicate their differences with word choice and arrangement or you can have the LUIS-calling application, such as a chatbot, make programmatic choices about how to handle the two top intents. 
 
+Two intents, that are too closely scored, may invert due to nondeterministic training. The top score could become the second top and the second top score could become the first top score. In order to prevent this, add example utterances to each of the top two intents for that utterance with word choice and context that differentiates the two intents. The two intents should have about the same number of example utterances. A rule of thumb for separation to prevent inversion due to training, is a 15% difference in scores.
+
 ## Return prediction score for all intents
 A test or endpoint result can include all intents. This configuration is set on the [endpoint](https://aka.ms/v1-endpoint-api-docs) with the `verbose=true` query string name/value pair. 
 

articles/cognitive-services/LUIS/luis-quickstart-intents-only.md

@@ -7,7 +7,7 @@ manager: cjgronlund
 ms.service: cognitive-services
 ms.component: language-understanding
 ms.topic: tutorial
-ms.date: 06/27/2018
+ms.date: 07/26/2018
 ms.author: diberry
 #Customer intent: As a new user, I want to understand how and why to only use intents and no entities in the app. 
 ---
@@ -28,7 +28,7 @@ This app is the simplest type of LUIS app because it doesn't extract data from t
 > * Add example utterances to ApplyForJob intent 
 > * Train, publish, and query endpoint again 
 
-For this article, you need a free [LUIS](luis-reference-regions.md#luis-website) account in order to author your LUIS application.
+[!include[LUIS Free account](../../../includes/cognitive-services-luis-free-key-short.md)]
 
 ## Purpose of the app
 This app has a few intents. The first intent, **`GetJobInformation`**, identifies when a user wants information about jobs available inside a company. The second intent, **`None`**, identifies every other type of utterance. Later in the quickstart, a third intent, `ApplyForJob`, is added. 
@@ -46,8 +46,6 @@ This app has a few intents. The first intent, **`GetJobInformation`**, identifie
 
 4. When that process finishes, the app shows the **Intents** page with the **None** Intent. 
 
-    [![](media/luis-quickstart-intents-only/intents-list.png "Screenshot of Intents list page")](media/luis-quickstart-intents-only/intents-list.png#lightbox)
-
 ## Create GetJobInformation intention
 1. Select **Create new intent**. Enter the new intent name `GetJobInformation`. This intent is predicted any time a user wants information about open jobs in your company.
 
@@ -86,16 +84,16 @@ This app has a few intents. The first intent, **`GetJobInformation`**, identifie
 
     ![Train button](./media/luis-quickstart-intents-only/train-button.png)
 
-    Training is complete when you see the green status bar at the top of the website confirming success.
+2. Training is complete when you see the green status bar at the top of the website confirming success.
 
     ![Trained status bar](./media/luis-quickstart-intents-only/trained.png)
 
-2. In the top, right side of the LUIS website, select the **Publish** button to open the Publish page. The production slot is selected by default. Select the **Publish** button by the production slot choice. Publishing is complete when you see the green status bar at the top of the website confirming success.
+## Publish app to endpoint
 
-    You do not have to create a LUIS endpoint key in the Azure portal before you publish or before you test the endpoint URL. Every LUIS app has a free starter key for authoring. It gives you unlimited authoring and a [few endpoint hits](luis-boundaries.md#key-limits). 
+[!include[LUIS How to Publish steps](../../../includes/cognitive-services-luis-tutorial-how-to-publish.md)] 
 
 ## Query endpoint for GetJobInformation intent
-1. On the **Publish** page, select the **endpoint** link at the bottom of the page. This action opens another browser window with the endpoint URL in the address bar. 
+1. [!include[LUIS How to get endpoint first step](../../../includes/cognitive-services-luis-tutorial-how-to-get-endpoint.md)]
 
 2. Go to the end of the URL in the address and enter `I'm looking for a job with Natual Language Processing`. The last query string parameter is `q`, the utterance **query**. This utterance is not the same as any of the example utterances in step 4 so it is a good test and should return the `GetJobInformation` intent as the top scoring intent. 
 
@@ -148,7 +146,10 @@ Return to the browser tab for the LUIS website and create a new intention to app
     [Train and publish](#train-and-publish-the-app) again. 
 
 ## Query endpoint for ApplyForJob intent
-On the **Publish** page, select the **endpoint** link at the bottom of the page. In the new browser window, enter `Can I submit my resume for job 235986` at the end of the URL. 
+
+1. [!include[LUIS How to get endpoint first step](../../../includes/cognitive-services-luis-tutorial-how-to-get-endpoint.md)]
+
+2. In the new browser window, enter `Can I submit my resume for job 235986` at the end of the URL. 
 
     ```
     {