Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 2020-2-ingestion-changes

Author: orspod

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

@@ -90,7 +90,7 @@ In ASP.NET Core, these settings are located in the [appsettings.json](https://gi
     // - "organizations" to sign in users in any work or school account
     // - "common" to sign in users with any work or school account or Microsoft personal account
     // - "consumers" to sign in users with a Microsoft personal account only
-    "TenantId": "[Enter the tenantId here]]",
+    "TenantId": "[Enter the tenantId here]",
 
     // Client ID (application ID) obtained from the Azure portal
     "ClientId": "[Enter the Client Id]",

articles/active-directory/fundamentals/whats-new-microsoft-365-government.md

@@ -65,6 +65,6 @@ For more information, see these articles:
 
 - [Azure Government AAD Authority Endpoint Update](https://devblogs.microsoft.com/azuregov/azure-government-aad-authority-endpoint-update/)
 
-- [Microsoft Graph endpoints in US Government cloud](https://developer.microsoft.com/graph/blogs/new-microsoft-graph-endpoints-in-us-government-cloud/)
+- [Microsoft Graph endpoints in US Government cloud](https://developer.microsoft.com/graph/blogs/new-microsoft-graph-endpoints-in-us-government-cloud/)
 
-- [Office 365 US Government GCC High and DoD](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/gcc-high-and-dod)
+- [Office 365 US Government GCC High and DoD](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/office-365-us-government/gcc-high-and-dod)

articles/active-directory/managed-identities-azure-resources/qs-configure-template-windows-vmss.md

@@ -185,7 +185,7 @@ In this section, you assign a user-assigned managed identity to a virtual machin
        "identity": {
            "type": "userAssigned",
            "identityIds": [
-               "[resourceID('Micrososft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
+               "[resourceID('Microsoft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
            ]
        }
 

articles/active-directory/saas-apps/media/ns1-sso-for-azure-tutorial/attribute-claim-edit.png

@@ -0,0 +1,180 @@
+---
+title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with NS1 SSO for Azure | Microsoft Docs'
+description: Learn how to configure single sign-on between Azure Active Directory and NS1 SSO for Azure.
+services: active-directory
+documentationCenter: na
+author: jeevansd
+manager: mtillman
+ms.reviewer: barbkess
+
+ms.assetid: 24a1afb6-b8b6-4787-bd4b-8fe3a32f8def
+ms.service: active-directory
+ms.subservice: saas-app-tutorial
+ms.workload: identity
+ms.tgt_pltfrm: na
+ms.topic: tutorial
+ms.date: 02/12/2020
+ms.author: jeedes
+
+ms.collection: M365-identity-device-management
+---
+
+# Tutorial: Azure Active Directory single sign-on (SSO) integration with NS1 SSO for Azure
+
+In this tutorial, you'll learn how to integrate NS1 SSO for Azure with Azure Active Directory (Azure AD). When you integrate NS1 SSO for Azure with Azure AD, you can:
+
+* Control in Azure AD who has access to NS1 SSO for Azure.
+* Enable your users to be automatically signed-in to NS1 SSO for Azure 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/manage-apps/what-is-single-sign-on).
+
+## 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/).
+* NS1 SSO for Azure single sign-on (SSO) enabled subscription.
+
+## Scenario description
+
+In this tutorial, you configure and test Azure AD SSO in a test environment.
+
+* NS1 SSO for Azure supports **SP and IDP** initiated SSO
+* Once you configure NS1 SSO for Azure you can enforce session control, which protect exfiltration and infiltration of your organization’s sensitive data in real-time. Session control extend from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/proxy-deployment-any-app).
+
+
+## Adding NS1 SSO for Azure from the gallery
+
+To configure the integration of NS1 SSO for Azure into Azure AD, you need to add NS1 SSO for Azure 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 **NS1 SSO for Azure** in the search box.
+1. Select **NS1 SSO for Azure** 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 for NS1 SSO for Azure
+
+Configure and test Azure AD SSO with NS1 SSO for Azure 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 NS1 SSO for Azure.
+
+To configure and test Azure AD SSO with NS1 SSO for Azure, complete the following building blocks:
+
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
+    1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
+    1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
+1. **[Configure NS1 SSO for Azure SSO](#configure-ns1-sso-for-azure-sso)** - to configure the single sign-on settings on application side.
+    1. **[Create NS1 SSO for Azure test user](#create-ns1-sso-for-azure-test-user)** - to have a counterpart of B.Simon in NS1 SSO for Azure that is linked to the Azure AD representation of user.
+1. **[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 **NS1 SSO for Azure** 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)
+
+1. On the **Basic SAML Configuration** section, if you wish to configure the application in **IDP** initiated mode, enter the values for the following fields:
+
+    a. In the **Identifier** text box, type the URL:
+    `https://api.nsone.net/saml/metadata`
+
+    b. In the **Reply URL** text box, type a URL using the following pattern:
+    `https://api.nsone.net/saml/sso/<ssoid>`
+
+1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
+
+    In the **Sign-on URL** text box, type the URL:
+    `https://my.nsone.net/#/login/sso`
+
+	> [!NOTE]
+	> The Reply URL value is not real. Update Reply URL value with the actual Reply URL. Contact [NS1 SSO for Azure Client support team](mailto:[email protected]) to get the value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+
+1. NS1 SSO for Azure application expects the SAML assertions in a specific format. Configure the following claims for this application. You can manage the values of these attributes from the **User Attributes** section on application integration page. On the **Set up Single Sign-On with SAML** page, click **Edit** button to open **User Attributes** dialog.
+
+    ![Attribute Section](./media/ns1-sso-for-azure-tutorial/attribute-edit-option.png)
+
+1. Click on the attribute name to edit the claim.
+
+    ![Attribute Section](./media/ns1-sso-for-azure-tutorial/attribute-claim-edit.png)
+
+1. Select **Transformation**.
+
+    ![Attribute Section](./media/ns1-sso-for-azure-tutorial/prefix-edit.png)
+
+1. On the **Manage transformation** section, perform the following steps:
+
+    ![Attribute Section](./media/ns1-sso-for-azure-tutorial/prefix-added.png)
+
+    1. Select **ExactMailPrefix()** as **Transformation**.
+
+    1. Select **user.userprincipalname** as **Parameter 1**.
+
+    1. Click on **Add**.
+
+    1. Click on **Save**
+
+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 computer.
+
+	![The Certificate download link](common/copy-metadataurl.png)
+
+### 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 NS1 SSO for Azure.
+
+1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
+1. In the applications list, select **NS1 SSO for Azure**.
+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.
+
+## Configure NS1 SSO for Azure SSO
+
+To configure single sign-on on **NS1 SSO for Azure** side, you need to send the **App Federation Metadata Url** to [NS1 SSO for Azure support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+
+### Create NS1 SSO for Azure test user
+
+In this section, you create a user called B.Simon in NS1 SSO for Azure. Work with NS1 SSO for Azure support team to add the users in the NS1 SSO for Azure platform. Users must be created and activated before you use single sign-on.
+
+## Test SSO 
+
+In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+
+When you click the NS1 SSO for Azure tile in the Access Panel, you should be automatically signed in to the NS1 SSO for Azure 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/manage-apps/what-is-single-sign-on)
+
+- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
+
+- [Try NS1 SSO for Azure with Azure AD](https://aad.portal.azure.com/)
+
+- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)

articles/active-directory/saas-apps/media/ns1-sso-for-azure-tutorial/attribute-edit-option.png

@@ -978,6 +978,8 @@
         href: nomadic-tutorial.md
       - name: Novatus
         href: novatus-tutorial.md
+      - name: NS1 SSO for Azure
+        href: ns1-sso-azure-tutorial.md
       - name: Nuclino
         href: nuclino-tutorial.md
       - name: O.C. Tanner - AppreciateHub

articles/active-directory/saas-apps/media/ns1-sso-for-azure-tutorial/prefix-added.png

@@ -71,7 +71,7 @@ When a new minor version is introduced, the oldest minor version and patch relea
 1.13.f
 ```
 
-And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and out of support.
+And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and are out of support.
 
 > [!NOTE]
 > Please note, that if customers are running an unsupported Kubernetes version, they will be asked to upgrade when
@@ -102,8 +102,7 @@ New Supported Version List
   * Customers have **30 days** from the public notification date to upgrade to a supported minor version release.
 * For new **patch** versions of Kubernetes
   * All users are notified of the new patch version being released and to upgrade to the latest patch release.
-  * Users have **30 days** to upgrade to a newer, supported patch release. Users have **30 days** to upgrade to
-    a supported patch release before the oldest is removed.
+  * Users have **30 days** to upgrade to a newer, supported patch release before the oldest is removed.
 
 AKS defines a "released version" as the generally available versions, enabled in all SLO / Quality of Service measurements and available in all regions. AKS may also support preview versions which are explicitly labeled and subject to Preview terms and conditions.
 
@@ -147,11 +146,11 @@ az aks get-versions --location eastus --output table
 If you are on the *n-3* version, you are outside of support and will be asked to upgrade. If your upgrade from version n-3 to n-2 succeeds, you are now within our support policies. For example:
 
 - If the oldest supported AKS version is are *1.13.a* and you are on *1.12.b* or older, you are outside of support.
-- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back in the within our support policies.
+- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back within our support policies.
 
 Upgrades to versions older than the supported window of *N-2* are not supported. In such cases, we recommend customers create new AKS clusters and redeploy their workloads with versions in the supported window.
 
-**What does 'Out of Support' mean**
+**What does 'Outside of Support' mean**
 
 'Outside of Support' means that the version you are running is outside of the supported versions list, and you will be
 asked to upgrade the cluster to a supported version when requesting support. Additionally, AKS does not make any