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

Author: yelevin

articles/active-directory/saas-apps/10000ftplans-tutorial.md

@@ -1,5 +1,5 @@
 ---
-title: 'Tutorial: Azure Active Directory integration with 10,000ft Plans | Microsoft Docs'
+title: 'Tutorial: Azure AD SSO integration with 10,000ft Plans'
 description: Learn how to configure single sign-on between Azure Active Directory and 10,000ft Plans.
 services: active-directory
 author: jeevansd
@@ -9,10 +9,10 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 07/23/2021
+ms.date: 09/29/2021
 ms.author: jeedes
 ---
-# Tutorial: Azure Active Directory integration with 10,000ft Plans
+# Tutorial: Azure AD SSO integration with 10,000ft Plans
 
 In this tutorial, you'll learn how to integrate 10,000ft Plans with Azure Active Directory (Azure AD). When you integrate 10,000ft Plans with Azure AD, you can:
 
@@ -70,22 +70,21 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
 4. On the **Basic SAML Configuration** section, perform the following steps:
 
-	a. In the **Sign-on URL** text box, type the URL:
-    `https://app.10000ft.com`
+	a. In the **Identifier (Entity ID)** text box, type the URL:
+    `https://rm.smartsheet.com/saml/metadata`
 
-    b. In the **Identifier (Entity ID)** text box, type the URL:
-    `https://app.10000ft.com/saml/metadata`
+    b. In the **Reply URL** text box, type the URL:
+    `https://rm.smartsheet.com/saml/acs`
+    
+    c. In the **Sign-on URL** text box, type the URL:
+    ` https://rm.smartsheet.com`
 
 	> [!NOTE]
 	> The value for **Identifier** is different if you have a custom domain. Contact [10,000ft Plans Client support team](https://www.10000ft.com/plans/support) to get this value. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
-5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Raw)** from the given options as per your requirement and save it on your computer.
+1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, select the copy icon to copy **App Federation Metadata Url**. Save it on your computer.
 
-	![The Certificate download link](common/certificateraw.png)
-
-6. On the **Set up 10,000ft Plans** section, copy the appropriate URL(s) as per your requirement.
-
-	![Copy configuration URLs](common/copy-configuration-urls.png)
+	![Screenshot of SAML Signing Certificate, with copy icon highlighted](common/copy-metadataurl.png)
 
 ### Create an Azure AD test user
 
@@ -113,7 +112,23 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure 10000ft Plans SSO
 
-To configure single sign-on on **10,000ft Plans** side, you need to send the downloaded **Certificate (Raw)** and appropriate copied URLs from Azure portal to [10,000ft Plans support team](https://www.10000ft.com/plans/support). They set this setting to have the SAML SSO connection set properly on both sides.
+1. Sign in to your 10000ft Plans website as an administrator.
+
+1. Click **Settings** and select **Account Settings** from the dropdown.
+
+    ![Screenshot for Settings icon.](./media/10000ftplans-tutorial/settings.png)
+
+1. Click **SSO** at the left menu and perform the following steps:
+
+    ![Screenshot for Settings SSO page.](./media/10000ftplans-tutorial/setup-sso.png)
+
+    a. Select **Automatic Configuration** in the Setup SSO section.
+
+    b. In the **IdP Metadata URL** text box, enter the **App Federation Metadata Url** value which you have copied from the Azure portal.
+
+    c. Enable the **Auto-provision authenticated users not in account** checkbox.
+
+    d. Click **Save**.
 
 ### Create 10000ft Plans test user
 

articles/active-directory/saas-apps/23video-tutorial.md

@@ -1,5 +1,5 @@
 ---
-title: 'Tutorial: Azure Active Directory integration with 23 Video | Microsoft Docs'
+title: 'Tutorial: Azure AD SSO integration with 23 Video'
 description: Learn how to configure single sign-on between Azure Active Directory and 23 Video.
 services: active-directory
 author: jeevansd
@@ -9,20 +9,18 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 08/07/2019
+ms.date: 09/29/2021
 ms.author: jeedes
 ---
 
-# Tutorial: Integrate 23 Video with Azure Active Directory
+# Tutorial: Azure AD SSO integration with 23 Video
 
 In this tutorial, you'll learn how to integrate 23 Video with Azure Active Directory (Azure AD). When you integrate 23 Video with Azure AD, you can:
 
 * Control in Azure AD who has access to 23 Video.
 * Enable your users to be automatically signed-in to 23 Video 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](../manage-apps/what-is-single-sign-on.md).
-
 ## Prerequisites
 
 To get started, you need the following items:
@@ -34,52 +32,52 @@ To get started, you need the following items:
 
 In this tutorial, you configure and test Azure AD SSO in a test environment.
 
-* 23 Video supports **SP** initiated SSO
+* 23 Video supports **SP** initiated SSO.
 
-## Adding 23 Video from the gallery
+## Add 23 Video from the gallery
 
 To configure the integration of 23 Video into Azure AD, you need to add 23 Video 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. Sign in to the Azure portal 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 **23 Video** in the search box.
 1. Select **23 Video** 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 for 23 Video
 
 Configure and test Azure AD SSO with 23 Video 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 23 Video.
 
-To configure and test Azure AD SSO with 23 Video, complete the following building blocks:
+To configure and test Azure AD SSO with 23 Video, perform the following steps:
 
 1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
-2. **[Configure 23 Video SSO](#configure-23-video-sso)** - to configure the Single Sign-On 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 23 Video test user](#create-23-video-test-user)** - to have a counterpart of B.Simon in 23 Video that is linked to the Azure AD representation of user.
-6. **[Test SSO](#test-sso)** - to verify whether the configuration works.
+    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 23 Video SSO](#configure-23-video-sso)** - to configure the single sign-on settings on application side.
+    1. **[Create 23 Video test user](#create-23-video-test-user)** - to have a counterpart of B.Simon in 23 Video 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
+## 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 **23 Video** application integration page, find the **Manage** section and select **Single sign-on**.
+1. In the Azure portal, on the **23 Video** 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.
+1. On the **Set up Single Sign-On with SAML** page, click the pencil icon for **Basic SAML Configuration** to edit the settings.
 
    ![Edit Basic SAML Configuration](common/edit-urls.png)
 
-1. On the **Basic SAML Configuration** section, enter the values for the following fields:
-
-	a. In the **Sign on URL** text box, type a URL using the following pattern:
-    `https://<subdomain>.23video.com`
+1. On the **Basic SAML Configuration** section, perform the following steps:
 
-    b. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
+    a. In the **Identifier (Entity ID)** text box, type a URL using the following pattern:
     `https://www.23video.com/saml/trust/<uniqueid>`
 
+	b. In the **Sign on URL** text box, type a URL using the following pattern:
+    `https://<subdomain>.23video.com`
+
 	> [!NOTE]
-	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [23 Video Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+	> These values are not real. Update these values with the actual Identifier and Sign on URL. Contact [23 Video Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
 1. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section,  find **Certificate (Base64)** and select **Download** to download the certificate and save it on your computer.
 
@@ -89,10 +87,6 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
 	![Copy configuration URLs](common/copy-configuration-urls.png)
 
-### Configure 23 Video SSO
-
-To configure single sign-on on **23 Video** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [23 Video support team](mailto:[email protected]). 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.
@@ -112,17 +106,15 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
 1. In the applications list, select **23 Video**.
 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 23 Video SSO
+
+To configure single sign-on on **23 Video** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [23 Video support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+
 ### Create 23 Video test user
 
 The objective of this section is to create a user called B.Simon in 23 Video.
@@ -135,30 +127,30 @@ The objective of this section is to create a user called B.Simon in 23 Video.
 
 3. In **Users** section, click **Configure**.
 
-    ![Screenshot that highlights the Users section.](./media/23video-tutorial/tutorial-23video-10.png)
+    ![Screenshot that highlights the Users section.](./media/23video-tutorial/settings.png)
 
 4. Click **Add a new user**.
 
-    ![Screenshot that highlights the Add a new user button.](./media/23video-tutorial/tutorial-23video-11.png)
+    ![Screenshot that highlights the Add a new user button.](./media/23video-tutorial/user.png)
 
 5. In the **Invite someone to join this site** section, perform the following steps:
 
-    ![Assign User](./media/23video-tutorial/tutorial-23video-12.png)
+    ![Assign User](./media/23video-tutorial/invite-user.png)
 
     a. In the **E-mail addresses** textbox, type the email address of a user like [email protected].  
 
     b. Click **Add the user..**.
 
-### Test SSO
+## Test SSO
 
-In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+In this section, you test your Azure AD single sign-on configuration with following options. 
 
-When you click the 23 Video tile in the Access Panel, you should be automatically signed in to the 23 Video for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
+* Click on **Test this application** in Azure portal. This will redirect to 23 Video Sign-on URL where you can initiate the login flow. 
 
-## Additional resources
+* Go to 23 Video Sign-on URL directly and initiate the login flow from there.
 
-- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](./tutorial-list.md)
+* You can use Microsoft My Apps. When you click the 23 Video tile in the My Apps, this will redirect to 23 Video Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](../user-help/my-apps-portal-end-user-access.md).
 
-- [What is application access and single sign-on with Azure Active Directory? ](../manage-apps/what-is-single-sign-on.md)
+## Next steps
 
-- [What is conditional access in Azure Active Directory?](../conditional-access/overview.md)
+Once you configure 23 Video you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).