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

Author: dagiro

.markdownlint.json

@@ -0,0 +1,43 @@
+{
+    "default": true,
+    "MD001": false,
+    "MD002": false,
+    "MD003": false,
+    "MD004": false,
+    "MD005": false,
+    "MD006": false,
+    "MD007": false,
+    "MD009": false,
+    "MD010": false,
+    "MD012": false,
+    "MD013": false,
+    "MD014": false,
+    "MD018": false,
+    "MD019": false,
+    "MD020": false,
+    "MD021": false,
+    "MD022": false,
+    "MD023": false,
+    "MD024": false,
+    "MD025": false,
+    "MD026": false,
+    "MD027": false,
+    "MD028": false,
+    "MD029": false,
+    "MD030": false,
+    "MD031": false,
+    "MD032": false,
+    "MD033": false,
+    "MD034": false,
+    "MD035": false,
+    "MD036": false,
+    "MD037": false,
+    "MD038": false,
+    "MD039": false,
+    "MD040": false,
+    "MD041": false,
+    "MD042": false,
+    "MD045": false,
+    "MD046": false,
+    "MD047": false
+}

.openpublishing.redirection.json

@@ -135,6 +135,11 @@
       "redirect_url": "https://docs.microsoft.com/azure/architecture/topics/high-performance-computing/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/virtual-machines/windows/new-azvm-demo.md",
+      "redirect_url": "/azure/virtual-machines/windows/quick-create-powershell",
+      "redirect_document_id": false
+    },	
     {
       "source_path": "articles/virtual-machines/linux/high-performance-computing.md",
       "redirect_url": "https://docs.microsoft.com/azure/architecture/topics/high-performance-computing/",
@@ -37273,11 +37278,6 @@
       "redirect_url": "/azure/azure-monitor/platform/activity-log-collect-tenants",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/azure-monitor/platform/oms-portal-transition.md",
-      "redirect_url": "/azure/azure-monitor/overview",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/azure-monitor/platform/oms-portal-faq.md",
       "redirect_url": "/azure/azure-monitor/overview",

articles/active-directory/conditional-access/controls.md

@@ -15,7 +15,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 03/23/2019
+ms.date: 06/15/2019
 ms.author: joflore
 ms.reviewer: calebb
 
@@ -124,11 +124,13 @@ Providers currently offering a compatible service include:
 
 - [Duo Security](https://duo.com/docs/azure-ca)
 - [Entrust Datacard](https://www.entrustdatacard.com/products/authentication/intellitrust)
+- [GSMA](https://mobileconnect.io/azure/)
 - [Ping Identity](https://documentation.pingidentity.com/pingid/pingidAdminGuide/index.shtml#pid_c_AzureADIntegration.html)
 - RSA
 - [SecureAuth](https://docs.secureauth.com/pages/viewpage.action?pageId=47238992#)
 - [Silverfort](https://www.silverfort.io/company/using-silverfort-mfa-with-azure-active-directory/)
 - [Symantec VIP](https://help.symantec.com/home/VIP_Integrate_with_Azure_AD)
+- [Thales (Gemalto)](https://resources.eu.safenetid.com/help/AzureMFA/Azure_Help/Index.htm)
 - [Trusona](https://www.trusona.com/docs/azure-ad-integration-guide)
 
 For more information on those services, contact the providers directly.

articles/active-directory/develop/scenario-web-app-sign-user-app-registration.md

@@ -45,14 +45,14 @@ If you navigate to this link, you can create bootstrap the creation of your web
 1. If your account gives you access to more than one tenant, select your account in the top-right corner, and set your portal session to the desired Azure AD tenant.
 1. In the left-hand navigation pane, select the **Azure Active Directory** service, and then select **App registrations** > **New registration**.
 1. When the **Register an application** page appears, enter your application's registration information:
-   - choose the supported account types for your application (See [Supported Account types](./v2-supported-account-types.md))
-   - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `AspNetCore-WebApp`.
-   - In **Reply URL**, add the reply URL for your app, for instance `https://localhost:44321/`, and select **Register**.
+   1. choose the supported account types for your application (See [Supported Account types](./v2-supported-account-types.md))
+   1. In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `AspNetCore-WebApp`.
+   1. In **Redirect URI**, add the type of application and the URI destination that will accept returned token responses after successfully authenticating. For example, `https://localhost:44321/`.  Select **Register**.
 1. Select the **Authentication** menu, and then add the following information:
-- In **Reply URL**, add `https://localhost:44321/signin-oidc`,  and select **Register**.
-- In the **Advanced settings** section, set **sign out URL** to `https://localhost:44321/signout-oidc`.
-- Under **Implicit grant**, check **ID tokens**.
-- Select **Save**.
+   1. In **Reply URL**, add `https://localhost:44321/signin-oidc`.
+   1. In the **Advanced settings** section, set **Logout URL** to `https://localhost:44321/signout-oidc`.
+   1. Under **Implicit grant**, check **ID tokens**.
+   1. Select **Save**.
 
 ### Register an app using PowerShell
 

articles/active-directory/managed-identities-azure-resources/known-issues.md

@@ -79,8 +79,8 @@ No. Managed identities do not currently support cross-directory scenarios.
 
 ### What Azure RBAC permissions are required to managed identity on a resource? 
 
-- System-assigned managed identity: You need write permissions over the resource. For example: Microsoft.Compute/virtualMachines/write or This action is included in resource specific built-in roles like [Virtual Machine Contributor](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#virtual-machine-contributor).
-- User-assigned managed identity: You need write permissions over the resource. For example: Microsoft.Compute/virtualMachines/write . In addition to [Managed Identity Operator](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#managed-identity-operator) role assignment over the managed identity. 
+- System-assigned managed identity: You need write permissions over the resource. For exampl, for virtual machines you need Microsoft.Compute/virtualMachines/write. This action is included in resource specific built-in roles like [Virtual Machine Contributor](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#virtual-machine-contributor).
+- User-assigned managed identity: You need write permissions over the resource. For example, for virtual machines you need Microsoft.Compute/virtualMachines/write. In addition to [Managed Identity Operator](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#managed-identity-operator) role assignment over the managed identity.
 
 ### How do you restart the managed identities for Azure resources extension?
 On Windows and certain versions of Linux, if the extension stops, the following cmdlet may be used to manually restart it:

articles/active-directory/saas-apps/costpoint-tutorial.md

@@ -0,0 +1,148 @@
+---
+title: 'Tutorial: Azure Active Directory integration with Costpoint | Microsoft Docs'
+description: Learn how to configure single sign-on between Azure Active Directory and Costpoint.
+services: active-directory
+documentationCenter: na
+author: jeevansd
+manager: mtillman
+ms.reviewer: celested
+
+ms.assetid: 9ecc5f58-4462-4ade-ab73-0a4f61027504
+ms.service: active-directory
+ms.subservice: saas-app-tutorial
+ms.workload: identity
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: tutorial
+ms.date: 06/11/2019
+ms.author: jeedes
+
+ms.collection: M365-identity-device-management
+---
+
+# Tutorial: Integrate Costpoint with Azure Active Directory
+
+In this tutorial, you'll learn how to integrate Costpoint with Azure Active Directory (Azure AD). When you integrate Costpoint with Azure AD, you can:
+
+* Control in Azure AD who has access to Costpoint.
+* Enable your users to be automatically signed-in to Costpoint with their Azure AD accounts.
+* Manage your accounts in one central location - the Azure portal.
+
+To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis).
+
+## Prerequisites
+
+To get started, you need the following items:
+
+* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
+* Costpoint single sign-on (SSO) enabled subscription.
+
+## Scenario description
+
+In this tutorial, you configure and test Azure AD SSO in a test environment. Costpoint supports **SP and IDP** initiated SSO.
+
+## Adding Costpoint from the gallery
+
+To configure the integration of Costpoint into Azure AD, you need to add Costpoint from the gallery to your list of managed SaaS apps.
+
+1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
+1. On the left navigation pane, select the **Azure Active Directory** service.
+1. Navigate to **Enterprise Applications** and then select **All Applications**.
+1. To add new application, select **New application**.
+1. In the **Add from the gallery** section, type **Costpoint** in the search box.
+1. Select **Costpoint** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
+
+## Configure and test Azure AD single sign-on
+
+Configure and test Azure AD SSO with Costpoint using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Costpoint.
+
+To configure and test Azure AD SSO with Costpoint, complete the following building blocks:
+
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** to enable your users to use this feature.
+2. **[Configure Costpoint](#configure-costpoint)** to configure the SSO settings on application side.
+3. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** to test Azure AD single sign-on with B.Simon.
+4. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** to enable B.Simon to use Azure AD single sign-on.
+5. **[Create Costpoint test user](#create-costpoint-test-user)** to have a counterpart of B.Simon in Costpoint that is linked to the Azure AD representation of user.
+6. **[Test SSO](#test-sso)** to verify whether the configuration works.
+
+### Configure Azure AD SSO
+
+Follow these steps to enable Azure AD SSO in the Azure portal.
+
+1. In the [Azure portal](https://portal.azure.com/), on the **Costpoint** application integration page, find the **Manage** section and select **Single sign-on**.
+1. On the **Select a Single sign-on method** page, select **SAML**.
+1. On the **Set up Single Sign-On with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
+
+   ![Edit Basic SAML Configuration](common/edit-urls.png)
+
+4. On the **Basic SAML Configuration** section, the application is pre-configured and the necessary URLs are already pre-populated with Azure. The user needs to save the configuration by clicking the **Save** button and perform the following step:
+
+    a. Click **Set additional URLs**.
+
+    b. In the **Relay State** text box, type a value using the following pattern:`<SYSTEM VALUE>`
+
+	> [!NOTE]
+	> The Relay State value is not real. Update this value with the actual Relay State. Contact [Costpoint Client support team](https://www.deltek.com/about/contact-us) to get this value.
+
+5. If you wish to configure the application in **SP** initiated mode perform the following step:
+
+	In the **Sign-on URL** text box, type a URL:
+    `https://costpointteea.deltek.com/cpweb/cploginform.htm`
+
+1. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your Notepad.
+
+   ![The Certificate download link](common/copy-metadataurl.png)
+
+1. On the **Set up Costpoint** section, copy the appropriate URL(s) based on your requirement.
+
+   ![Copy configuration URLs](common/copy-configuration-urls.png)
+
+### Configure Costpoint
+
+To configure single sign-on on **Costpoint** side, you need to send the **App Federation Metadata Url** to [Costpoint Client support team](https://www.deltek.com/about/contact-us). They set this setting to have the SAML SSO connection set properly on both sides.
+
+### Create an Azure AD test user
+
+In this section, you'll create a test user in the Azure portal called B.Simon.
+
+1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
+1. Select **New user** at the top of the screen.
+1. In the **User** properties, follow these steps:
+   1. In the **Name** field, enter `B.Simon`.  
+   1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
+   1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
+   1. Click **Create**.
+
+### Assign the Azure AD test user
+
+In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Costpoint.
+
+1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
+1. In the applications list, select **Costpoint**.
+1. In the app's overview page, find the **Manage** section and select **Users and groups**.
+
+   ![The "Users and groups" link](common/users-groups-blade.png)
+
+1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
+
+	![The Add User link](common/add-assign-user.png)
+
+1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
+1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
+1. In the **Add Assignment** dialog, click the **Assign** button.
+
+### Create Costpoint test user
+
+In this section, you create a user called B.Simon in Costpoint. Work with [Costpoint Client support team](https://www.deltek.com/about/contact-us) to add the users in the Costpoint platform. Users must be created and activated before you use single sign-on. 
+
+### Test SSO
+
+When you select the Costpoint tile in the Access Panel, you should be automatically signed in to the Costpoint for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
+
+## Additional Resources
+
+- [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
+
+- [What is application access and single sign-on with Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
+
+- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)