resolving merge conflicts

Author: Qian Wen

articles/active-directory/conditional-access/concept-conditional-access-report-only.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 03/25/2020
+ms.date: 05/01/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -23,7 +23,7 @@ Report-only mode is a new Conditional Access policy state that allows administra
 
 - Conditional Access policies can be enabled in report-only mode.
 - During sign-in, policies in report-only mode are evaluated but not enforced.
-- Results are logged in the **Conditional Access** and **Report-only (Preview)** tabs of the Sign-in log details.
+- Results are logged in the **Conditional Access** and **Report-only** tabs of the Sign-in log details.
 - Customers with an Azure Monitor subscription can monitor the impact of their Conditional Access policies using the Conditional Access insights workbook.
 
 > [!WARNING]

articles/active-directory/conditional-access/howto-conditional-access-insights-reporting.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: article
-ms.date: 04/30/2020
+ms.date: 05/01/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo

articles/active-directory/conditional-access/howto-conditional-access-report-only.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 03/25/2020
+ms.date: 05/01/2020
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -15,7 +15,7 @@ ms.reviewer: dawoo
 
 ms.collection: M365-identity-device-management
 ---
-# Configure a Conditional Access policy in report-only mode (Preview)
+# Configure a Conditional Access policy in report-only mode
 
 To configure a Conditional Access policy in report-only mode:
 
@@ -39,7 +39,7 @@ To view the result of a report-only policy for a particular sign-in:
 1. Sign into the **Azure portal** as a reports reader, security reader, security administrator, or global administrator.
 1. Browse to **Azure Active Directory** > **Sign-ins**.
 1. Select a sign-in or add filters to narrow results.
-1. In the **Details** drawer, select the **Report-only (Preview)** tab to view the policies evaluated during sign-in.
+1. In the **Details** drawer, select the **Report-only** tab to view the policies evaluated during sign-in.
 
 > [!NOTE]
 > When downloading the Sign-ins logs, choose JSON format to include Conditional Access report-only result data.
@@ -59,7 +59,7 @@ Once you've integrated your Azure AD logs with Azure Monitor, you can monitor th
 
 1. Sign into the **Azure portal** as a security administrator or global administrator.
 1. Browse to **Azure Active Directory** > **Workbooks**.
-1. Select **Conditional Access Insights (Preview)**.
+1. Select **Conditional Access Insights**.
 1. Select one or more policies from the **Conditional Access Policy** dropdown. All enabled policies are selected by default.
 1. Select a time range (if the time range exceeds the available dataset, the report will show all available data). Once you have set the **Conditional Access Policy** and **Time Range** parameters, the report will load.
    1. Optionally, search for individual **Users** or **Apps** to narrow the scope of the report.

articles/active-directory/conditional-access/media/concept-conditional-access-report-only/report-only-detail-in-sign-in-log.png

@@ -163,7 +163,7 @@ In the following examples, you create, update, link, and delete policies on appl
 
 If nothing is returned, it means you have no policies created in your tenant.
 
-### Example: Set HRD policy for an application 
+### Example: Set an HRD policy for an application 
 
 In this example, you create a policy that when it is assigned to an application either: 
 - Auto-accelerates users to an AD FS sign-in screen when they are signing in to an application when there is a single domain in your tenant. 
@@ -246,7 +246,7 @@ Note the **ObjectID** of the policy that you want to list assignments for.
 Get-AzureADPolicyAppliedObject -id <ObjectId of the Policy>
 ```
 
-### Example: Remove an HRD policy for an application
+### Example: Remove an HRD policy from an application
 #### Step 1: Get the ObjectID
 Use the previous example to get the **ObjectID** of the policy, and that of the application service principal from which you want to remove it. 
 

articles/active-directory/conditional-access/media/howto-conditional-access-insights-reporting/conditional-access-insights-and-reporting-dashboard.png

@@ -43,7 +43,7 @@ including device platform, device state, client app, sign-in risk, location, and
 reports how many users were granted or denied access, as well as how many users bypassed 
 Conditional Access policies when accessing resources.
 
-- To help you to address these questions, Active Directory provides workbooks for monitoring. [Azure Monitor workbooks](https://docs.microsoft.com/azure/azure-monitor/app/usage-workbooks) combine text, analytics queries, metrics, and parameters into rich interactive reports.
+- To help you to address these questions, Azure Active Directory provides workbooks for monitoring. [Azure Monitor workbooks](https://docs.microsoft.com/azure/azure-monitor/app/usage-workbooks) combine text, analytics queries, metrics, and parameters into rich interactive reports.
 
 
 
@@ -59,7 +59,7 @@ This article:
 
 To use Monitor workbooks, you need:
 
-- An Active Directory tenant with a premium (P1 or P2) license. Learn how to [get a premium license](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-get-started-premium).
+- An Azure Active Directory tenant with a premium (P1 or P2) license. Learn how to [get a premium license](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-get-started-premium).
 
 - A [Log Analytics workspace](https://docs.microsoft.com/azure/azure-monitor/learn/quick-create-workspace).
 

articles/active-directory/conditional-access/media/howto-conditional-access-insights-reporting/workbook-breakdown-condition-and-status.png

@@ -34,7 +34,7 @@ To learn more about SaaS app integration with Azure AD, see [What is application
 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/).
-* Float single sign-on (SSO) enabled subscription.
+* A Float subscription. If you don't have a subscription, you can get a [free account](https://app.float.com/join?).
 
 ## Scenario description
 
@@ -89,7 +89,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     In the **Sign-on URL** text box, type a URL in the pattern `https://<hostname>.float.com/login`.
 
     > [!NOTE]
-    > These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [Float 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, Reply URL and Sign-on URL. Replace <hostname> with your Float hostname. Contact [Float Client support team](mailto:[email protected]) if you are unsure. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
 1. Float application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes.
 
@@ -140,11 +140,11 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Float SSO
 
-To configure single sign-on on **Float** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Float support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+To configure single sign-on on **Float** side, visit the Float Team Settings section and select Configure from the Authentication module. Paste the Azure AD Login URL in the SAML 2.0 Endpoint URL field, paste the Azure AD Indentifier in the Identity Provider Issuer URL field, paste the full text from the downloaded **Certificate (Base64)** in the X.509 Certificate field, and Save.
 
 ### Create Float test user
 
-In this section, you create a user called Britta Simon in Float. Work with [Float support team](mailto:[email protected]) to add the users in the Float platform. Users must be created and activated before you use single sign-on.
+In this section, create a user called Britta Simon in Float. Add the user from the People section or Team Settings Guest section, and grant them an access right. Users must be created and accept the invitation before you use single sign-on.
 
 ## Test SSO