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

Author: dagiro

articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md

@@ -50,7 +50,7 @@ The Azure AD default for browser session persistence allows users on personal de
 Conditional access is an Azure AD Premium capability and requires a premium license. If you would like to learn more about conditional access, see [What is conditional access in Azure Active Directory?](overview.md#license-requirements)
 
 > [!WARNING]
-> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on October 15 and replace it with the conditional access authentication session management feature.  
+> If you are using the [configurable token lifetime](../develop/active-directory-configurable-token-lifetimes.md) feature currently in public preview, please note that we don’t support creating two different policies for the same user or app combination: one with this feature and another one with configurable token lifetime feature. Microsoft plans to retire the configurable token lifetime feature on November 1 and replace it with the conditional access authentication session management feature.  
 
 ### Policy 1: Sign-in frequency control
 

articles/active-directory/privileged-identity-management/media/azure-ad-pim-approval-workflow/image021.png

@@ -11,54 +11,60 @@ ms.service: active-directory
 ms.topic: conceptual
 ms.workload: identity
 ms.subservice: pim
-ms.date: 02/14/2017
+ms.date: 06/10/2019
 ms.author: rolyon
 ms.custom: pim
 
 ms.collection: M365-identity-device-management
 ---
 # View audit history for Azure AD roles in PIM
-You can use the Azure Active Directory (Azure AD) Privileged Identity Management (PIM) audit history to see all the user assignments and activations within a given time period for all privileged roles. If you want to see the full audit history of activity in your tenant, including administrator, end user, and synchronization activity, you can use the [Azure Active Directory access and usage reports.](../reports-monitoring/overview-reports.md)
 
-## Navigate to audit history
-From the [Azure portal](https://portal.azure.com) dashboard, select the **Azure AD Privileged Identity Management** app. From there, access the audit history by clicking **Manage privileged roles** > **Audit history** in the PIM dashboard.
+You can use the Azure Active Directory (Azure AD) Privileged Identity Management (PIM) audit history to see all the role assignments and activations within the past 30 days for all privileged roles. If you want to see the full audit history of activity in your directory, including administrator, end user, and synchronization activity, you can use the [Azure Active Directory security and activity reports](../reports-monitoring/overview-reports.md).
 
-![Audit history](media/azure-ad-pim-approval-workflow/image021.png)
+## View audit history
 
-> [!NOTE]
-> You can sort the data by Action, and look for “Activation Approved”
+Follow these steps to view the audit history for Azure AD roles.
 
+1. Sign in to [Azure portal](https://portal.azure.com/) with a user that is a member of the [Privileged Role Administrator](../users-groups-roles/directory-assign-admin-roles.md#privileged-role-administrator) role.
 
-## Audit history graph
-You can use the audit history to view the total activations, max activations per day, and average activations per day in a line graph.  You can also filter the data by role if there is more than one role in the audit history.
+1. Open **Azure AD Privileged Identity Management**.
 
-Use the **time**, **action**, and **role** buttons to sort the history.
+1. Click **Azure AD roles**.
 
-## Audit history list
-The columns in the audit history list are:
+1. Click **Directory roles audit history**.
 
-* **Requestor** - the user who requested the role activation or change.  If the value is "Azure System", check the Azure audit history for more information.
-* **User** - the user who is activating or assigned to a role.
-* **Role** - the role assigned or activated by the user.
-* **Action** - the actions taken by the requestor. This can include assignment, unassignment, activation, or deactivation.
-* **Time** - when the action occurred.
-* **Reasoning** - if any text was entered into the reason field during activation, it will show up here.
-* **Expiration** - only relevant for activation of roles.
+    Depending on your audit history, a column chart is displayed along with the total activations, max activations per day, and average activations per day.
+
+    ![Directory roles audit history](media/pim-how-to-use-audit-log/directory-roles-audit-history.png)
+
+    At the bottom of the page, a table is displayed with information about each action in the available audit history. The columns have the following meanings:
+
+    | Column | Description |
+    | --- | --- |
+    | Time | When the action occurred. |
+    | Requestor | User who requested the role activation or change. If the value is **Azure System**, check the Azure audit history for more information. |
+    | Action | Actions taken by the requestor. Actions can include Assign, Unassign, Activate, Deactivate, or AddedOutsidePIM. |
+    | Member | User who is activating or assigned to a role. |
+    | Role | Role assigned or activated by the user. |
+    | Reasoning | Text that was entered into the reason field during activation. |
+    | Expiration | When an activated role expires. Applies only to eligible role assignments. |
+
+1. To sort the audit history, click the **Time**, **Action**, and **Role** buttons.
 
 ## Filter audit history
-You can filter the information that shows up in the audit history by clicking the **Filter** button.  The **Update chart parameters blade** will appear.
 
-After you set the filters, click **Update** to filter the data in the history.  If the data doesn't appear right away, refresh the page.
+1. At the top of the audit history page, click the **Filter** button.
+
+    The **Update chart parameters** pane appears.
+
+1. In **Time range**, select a time range.
 
-### Change the date range
-Use the **Today**, **Past Week**, **Past Month**, or **Custom** buttons to change the time range of the audit history.
+1. In **Roles**, add checkmarks for the roles you want to view.
 
-When you choose the **Custom** button, you will be given a **From** date field and a **To** date field to specify a range of dates for the history.  You can either enter the dates in MM/DD/YYYY format or click on the **calendar** icon and choose the date from a calendar.
+    ![Update chart parameters pane](media/pim-how-to-use-audit-log/update-chart-parameters.png)
 
-### Change the roles included in the history
-Check or uncheck the **Role** checkbox next to each role to include or exclude it from the history.
+1. Click **Done** to view the filtered audit history.
 
-<!--Every topic should have next steps and links to the next logical set of content to keep the customer engaged-->
 ## Next steps
 
 - [View activity and audit history for Azure resource roles in PIM](azure-pim-resource-rbac.md)

articles/active-directory/privileged-identity-management/media/pim-how-to-use-audit-log/directory-roles-audit-history.png

@@ -114,7 +114,7 @@ To configure Azure AD single sign-on with Pluralsight, perform the following ste
 	> [!NOTE]
 	> These values are not real. Update these values with the actual Sign-On URL and Reply URL. Contact [Pluralsight 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.
 
-5. Pluralsight 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. Click **Edit** icon to open **User Attributes** dialog.
+5. Pluralsight 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. Click **Edit** icon to open **User Attributes** dialog.
 	![image](common/edit-attribute.png)
 
 	>[!NOTE]

articles/active-directory/privileged-identity-management/media/pim-how-to-use-audit-log/update-chart-parameters.png

@@ -113,7 +113,7 @@ To configure Azure AD single sign-on with SmartDraw, perform the following steps
     > [!NOTE]
 	> The Sign-on URL value is not real. You will update the Sign-on URL value with the actual Sign-on URL, which is explained later in the tutorial. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
-6. SmartDraw 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. Click **Edit** icon to open **User Attributes** dialog.
+6. SmartDraw 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. Click **Edit** icon to open **User Attributes** dialog.
 
 	![image](common/edit-attribute.png)
 
@@ -172,13 +172,13 @@ To configure Azure AD single sign-on with SmartDraw, perform the following steps
 
 	a. In the **Your Domain (like acme.com)** textbox, type your domain.
 
-	b. Copy the **Your SP Initiated Login Url will be** for your instance and paste it in Sign-on URL textbox in **Basic SAML Configuration** on Azure portal.
+	b. Copy the **Your SP Initiated Login Url will be** for your instance and paste it in Sign-on URL textbox in **Basic SAML Configuration** on Azure portal.
 
 	c. In the **Security Groups to Allow SmartDraw Access** textbox, type **Everyone**.
 
 	d. In the **Your SAML Issuer Url** textbox, paste the value of **Azure AD Identifier** which you have copied from the Azure portal.
 
-	e. In Notepad, open the Metadata XML file that you downloaded from the Azure portal, copy its content, and then paste it into the **Your SAML MetaData** box.
+	e. In Notepad, open the Metadata XML file that you downloaded from the Azure portal, copy its content, and then paste it into the **Your SAML MetaData** box.
 
 	f. Click **Save Configuration**	
 

articles/active-directory/privileged-identity-management/pim-how-to-use-audit-log.md

@@ -101,9 +101,9 @@ To configure Azure AD single sign-on with TINFOIL SECURITY, perform the followin
 
     ![TINFOIL SECURITY Domain and URLs single sign-on information](common/preintegrated.png)
 
-5. Your TINFOIL SECURITY 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. Click **Edit** icon to open **User Attributes** dialog.
+5. Your TINFOIL SECURITY 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. Click **Edit** icon to open **User Attributes** dialog.
 
-	    ![image](common/edit-attribute.png)
+	    ![image](common/edit-attribute.png)
 
 6. In addition to above, TINFOIL SECURITY application expects few more attributes to be passed back in SAML response. In the **User Claims** section on the **User Attributes** dialog, perform the following steps to add SAML token attribute as shown in the below table:
 

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

@@ -110,7 +110,7 @@ To configure Azure AD single sign-on with Zoom, perform the following steps:
 	> [!NOTE]
 	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Zoom Client support team](https://support.zoom.us/hc/en-us) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
-5. Zoom 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. Click **Edit** icon to open **User Attributes** dialog.
+5. Zoom 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. Click **Edit** icon to open **User Attributes** dialog.
 
 	![image](common/edit-attribute.png)
 

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

@@ -476,9 +476,7 @@ App Service for Linux supports two runtimes for managed hosting of Java web appl
 
 ### JDK versions and maintenance
 
-Azure's supported Java Development Kit (JDK) is [Zulu](https://www.azul.com/downloads/azure-only/zulu/) provided through [Azul Systems](https://www.azul.com/).
-
-Major version updates will be provided through new runtime options in Azure App Service for Linux. Customers update to these newer versions of Java by configuring their App Service deployment and are responsible for testing and ensuring the major update meets their needs.
+Azul Zulu Enterprise builds of OpenJDK are a no-cost, multi-platform, production-ready distribution of the OpenJDK for Azure and Azure Stack backed by Microsoft and Azul Systems. They contain all the components for building and running Java SE applications. You can install the JDK from [Java JDK Installation](https://aka.ms/azure-jdks).
 
 Supported JDKs are automatically patched on a quarterly basis in January, April, July, and October of each year.
 
@@ -490,18 +488,6 @@ Patches and fixes for major security vulnerabilities will be released as soon as
 
 If a supported Java runtime will be retired, Azure developers using the affected runtime will be given a deprecation notice at least six months before the runtime is retired.
 
-### Local development
-
-Developers can download the Production Edition of Azul Zulu Enterprise JDK for local development from [Azul's download site](https://www.azul.com/downloads/azure-only/zulu/).
-
-### Development support
-
-Product support for the [Azure-supported Azul Zulu JDK](https://www.azul.com/downloads/azure-only/zulu/) is available through when developing for Azure or [Azure Stack](https://azure.microsoft.com/overview/azure-stack/) with a [qualified Azure support plan](https://azure.microsoft.com/support/plans/).
-
-### Runtime support
-
-Developers can [open an issue](/azure/azure-supportability/how-to-create-azure-support-request) with the Azul Zulu JDKs through Azure Support if they have a [qualified support plan](https://azure.microsoft.com/support/plans/).
-
 ## Next steps
 
 Visit the [Azure for Java Developers](/java/azure/) center to find Azure quickstarts, tutorials, and Java reference documentation.