Merge pull request #103882 from mgblythe/mb-0210-admin-timeout

Admin timeout + recover dashboard

Author: PRMerger6

articles/azure-portal/admin-timeout.md

@@ -5,19 +5,20 @@ services: azure-portal
 keywords: settings, timeout
 author: mgblythe
 ms.author: mblythe
-ms.date: 12/19/2019
+ms.date: 02/10/2020
 ms.topic: conceptual
 
 ms.service: azure-portal
 manager:  mtillman
 ---
+
 # Set directory-level inactivity timeout
 
-The inactivity timeout setting helps to protect your resources from unauthorized access if users forget to secure their workstation. When a user has been idle for a while, their Azure portal session is automatically signed out. Admins can enforce the maximum idle time before a session is signed out. The inactivity timeout setting applies at the directory level. For more information about directories, see [Active Directory Domain Services Overview](/windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview).
+The inactivity timeout setting helps to protect your resources from unauthorized access if users forget to secure their workstation. When a user has been idle for a while, their Azure portal session is automatically signed out. Admins in the [Global Administrator role](../active-directory/users-groups-roles/directory-assign-admin-roles.md#global-administrator--company-administrator) can enforce the maximum idle time before a session is signed out. The inactivity timeout setting applies at the directory level. For more information about directories, see [Active Directory Domain Services Overview](/windows-server/identity/ad-ds/get-started/virtual-dc/active-directory-domain-services-overview).
 
 ## Configure the inactive timeout setting
 
-If you’re an admin, and you want to enforce an idle timeout setting for all users of the Azure portal, follow these steps:
+If you’re a Global Administrator, and you want to enforce an idle timeout setting for all users of the Azure portal, follow these steps:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 2. Select **Settings** from the global page header.

articles/azure-portal/recover-shared-deleted-dashboard.md

@@ -13,7 +13,7 @@ manager:  mtillman
 
 # Recover a deleted dashboard in the Azure portal
 
-If you delete a _published_ dashboard in the Azure portal, you can recover that dashboard within 14 days of the delete. If the dashboard isn't published, you cannot recover it, and you must rebuild it. For more information about publishing a dashboard, see [Publish dashboard](azure-portal-dashboard-share-access.md#publish-dashboard). Follow these steps to recover a published dashboard:
+If you're in the public Azure cloud, and you delete a _published_ dashboard in the Azure portal, you can recover that dashboard within 14 days of the delete. If you're in an Azure government cloud or the dashboard isn't published, you cannot recover it, and you must rebuild it. For more information about publishing a dashboard, see [Publish dashboard](azure-portal-dashboard-share-access.md#publish-dashboard). Follow these steps to recover a published dashboard:
 
 1. From the Azure portal menu, select **Resource groups**, then select the resource group where you published the dashboard (by default, it's named **dashboards**).