Merge pull request #2906 from truenas/PD-1284-Update-Content-on-Toolbar-Settings-Menu

Pd 1284 update content on toolbar settings menu

Author: DjP-iX

content/SCALE/SCALETutorials/SystemSettings/Advanced/ManageGlobal2FASCALE.md

@@ -1,6 +1,6 @@
 ---
 title: "Managing Global 2FA (Two-Factor Authentication)"
-description: "Provides information on SCALE global two-factor authentication, setting it up, and logging in with it enabled."
+description: "Provides information on setting up and managing global two-factor authentication, and logging in with it enabled."
 weight: 70
 alias:
  - /scale/scaletutorials/credentials/2fascale
@@ -16,7 +16,7 @@ keywords:
 
 Global Two-factor authentication (2FA) is great for increasing security.
 
-TrueNAS offers global 2FA to ensure that entities cannot use a compromised administrator root password to access the administrator interface.
+TrueNAS offers global 2FA to ensure that entities cannot use a compromised administrator or root password to access the administrator interface.
 
 {{< include file="/static/includes/AdvancedSettingsWarningSCALE.md" >}}
 
@@ -67,16 +67,26 @@ Before you begin, download Google Authenticator to your mobile device.
 
    TrueNAS takes you to the **Two-Factor Authentication** screen to finish 2FA setup.
 
-   {{< trueimage src="/images/SCALE/SystemSettings/2FAScreenEnabled.png" alt="2FAScreenEnabled" id="2FA Screen with Enabled Message" >}}
+   You can also access the two-factor authentication settings for the currently logged-in user from the **Settings** option on the top toolbar.
+   Click on the **Settings** icon, then select **Two-Factor Authentication** to open the **User Two-Factor Authentication Actions** screen.
+
+   {{< trueimage src="/images/SCALE/SystemSettings/UserTwoFactorAuthenticationActionsScreen.png" alt="User Two-Factor Authentication Actions Screen" id="User Two-Factor Authentication Actions Screen" >}}
+
+   Click **Configure 2FA Secret** to view the QR code.
+
+   {{< hint type="info">}}
+   You can configure two-factor authentication and get the QR code for an authenticator app for the logged-in user at any time, but you must configure global two-factor authentication to enable it.
+   {{< /hint >}}
 
    When using Google Authenticator, set **Interval** to **30** or the authenticator code might not function when logging in.
 
-3. Click **Show QR** and scan the QR code using Google Authenticator.
+3. Click **Configure 2FA Secret** to open the **User Two-Factor Authentication Actions** screen where you scan the QR code using Google Authenticator.
+   To generate a new QR code click **Renew 2FA Secret**.
 
    After scanning the code click **CLOSE** to close the dialog on the **Two-Factor Authentication** screen.
 
 Accounts that are already configured with individual 2FA are not prompted for 2FA login codes until **Global 2FA** is enabled.
-When **Global 2FA** is enabled, user accounts that have not configured 2FA settings yet are shown the **Two-Factor Authentication** screen on their next login to configure and enable 2FA authentication for that account.
+When **Global 2FA** is enabled, user accounts without 2FA settings configured see the **Two-Factor Authentication** screen on their next login to configure and enable 2FA authentication for that account.
 
 ### Disabling or Bypassing 2FA
 Go to **System > Advanced**, scroll down to the **Global Two Factor Authentication** widget, and click **Config**. Clear the **Enable Two-Factor Authentication Globally** checkbox and click **Save**.
@@ -85,15 +95,16 @@ Go to **System > Advanced**, scroll down to the **Global Two Factor Authenticati
 If you want to enable 2FA again, go to **System > Advanced**, scroll down to the **Global Two Factor Authentication** widget, and click **Config**.
 
 Check **Enable Two Factor Authentication Globally**, then click **Save**.
-To change the system-generated **Secret**, go to **Credentials > 2FA** and click **Renew 2FA Secret**.
+To change the system-generated **Secret**, click on the **Settings** icon on the top toolbar and select **Two-Factor Authentication**. 
+Click **Renew 2FA Secret**.
 
 ## Using 2FA to Log in to TrueNAS
-Enabling 2FA changes the login process for both the TrueNAS web interface and SSH logins.
+Enabling 2FA changes the log in process for both the TrueNAS web interface and SSH logins.
 
 ### Logging In Using the Web Interface
 The login screen adds another field for the randomized authenticator code. If this field is not immediately visible, try refreshing the browser.
 
-Enter the code from the mobile device (without the space) in the login window and use the root username and password.
+Enter the code from the mobile device (without the space) in the login window and use the admin username and password.
 
 {{< trueimage src="/images/SCALE/Login/2faSigninSplashScreen.png" alt="2FA Signin Splash Screen" id="2FA Splash Screen" >}}
 

content/SCALE/SCALEUIReference/Credentials/2FAScreenSCALE.md content/SCALE/SCALEUIReference/TopToolbar/Settings/2FAScreenSCALE.md

@@ -13,9 +13,10 @@ tags:
 Two-factor authentication is time-based and requires a correct system time setting.
 {{< /hint >}}
 
-The **Two-Factor Authentication** screen has buttons to manage two-factor authentication (2FA) credentials, and it displays a different message depending on if you have 2FA enabled or disabled.
+The **Two-Factor Authentication** screen, accessed from the **Settings** menu on the top toolbar, allows managing user-level two-factor authentication (2FA) credentials. It shows a different message if 2FA enabled than when not configured or disabled.
 
-To configure 2FA settings go to the [**Advanced**]({{< relref "AdvancedSettingsScreen.md" >}}) settings screen. For more information, see the [Managing Global 2FA]({{< relref "ManageGlobal2FASCALE.md" >}}) tutorial.
+To configure 2FA settings go to the [**Advanced**]({{< relref "AdvancedSettingsScreen.md" >}}) settings screen.
+For more information, see the [Managing Global 2FA]({{< relref "ManageGlobal2FASCALE.md" >}}) tutorial.
 
 {{< trueimage src="/images/SCALE/Credentials/2FAScreenDisabled.png" alt="2FAScreenDisabled" id="2FA Screen with Disabled Message" >}}
 

content/SCALE/SCALEUIReference/TopToolbar/_index.md

@@ -33,8 +33,8 @@ The top toolbar icon buttons provide access to the iXsystems website, displays t
 | <span class="material-icons">info</span> | Directory Services status | Displays a dialog with the status of Active Directory and LDAP directory servers configured on the system. |
 | <span class="material-icons">assignment</span> | Jobs | Displays the Jobs dialog. Click the **History** button to display the **Tasks** screen with a list of **All**, **Active** or **Failed** tasks or processes. |
 | <span class="material-icons">notifications</span> | Alerts | Displays a list of system alerts and a dropdown list with the alert options **Alert Settings** and **Email**. |
-| <span class="material-icons">account_circle</span> | Settings | Displays a dropdown list of setting options **Change Password**, **Two-Factor Authentication**, **API Keys**, **Guide** and **About**. |
-| <span class="material-icons">power_settings_new</span> | Power options | Displays the power related options **Log Out**, **Restart** or **Shut Down**. |
+| <span class="material-icons">account_circle</span> | Settings | Displays a dropdown list of setting options **Change Password**, **Two-Factor Authentication**, **API Keys**, **Guide**, **About**, and **Log Out**. |
+| <span class="material-icons">power_settings_new</span> | Power options | Displays the power related options **Restart** or **Shut Down**. |
 {{< /truetable >}}
 
 ### Search UI
@@ -82,9 +82,11 @@ The <span class="material-icons-outlined">info</span> **About** icon button disp
 
 {{< trueimage src="/images/SCALE/Dashboard/AboutWindow.png" alt="About Window" id="About Window" >}}
 
+The <span class="iconify" data-icon="bx:exit">info</span> **Log Out** icon button logs the currently logged in user out of the SCALE UI.
+
 ### Power
 
-The **Power** <span class="material-icons">power_settings_new</span> button provides three options that let the user log out of the web UI, restart, or shut down their TrueNAS system.
+The **Power** <span class="material-icons">power_settings_new</span> button provides two options that let the user restart or shut down their TrueNAS system.
 
 <div class="noprint">
 

static/images/SCALE/SystemSettings/UserTwoFactorAuthenticationActionsScreen.png

@@ -41,7 +41,7 @@ Users can also use the iXsystems home page to access their customer portal and t
 {{< /expand >}}
 
 {{< expand "Settings" "v" >}}
-The **Settings** <span class="material-icons">account_circle</span> icon opens a dropdown list of options for passwords, API keys, and TrueNAS information.
+The **Settings** <span class="material-icons">account_circle</span> icon opens a dropdown list of options to change passwords, set up user two-factor authentication, create and manage API keys, access the TrueNAS API guide, see information on the system, and to logout of the SCALE UI.
 {{< expand "Change Password" >}}
 {{< include file="/static/includes/ChangeLoggedInUserPassword.md" >}}
 {{< /expand >}}
@@ -64,15 +64,19 @@ Click on **About** <span class="iconify" data-icon="ant-design:info-circle-outli
 
 {{< trueimage src="/images/SCALE/Dashboard/TrueNASAboutScreenSCALE.png" alt="About Window" id="About Window" >}}
 
+{{< /expand >}}
+
+{{< expand "Log Out" "v" >}}
+**Log Out** logs the current user out of the SCALE UI, but does not power off the system. 
+The **Read-Only Admin** and **Sharing Admin** roles only have access to the **Log Out** option.
 {{< /expand >}}
 {{< /expand >}}
 
 {{< expand "Power Options" "v" >}}
 Click the **Power** <span class="material-icons">power_settings_new</span> button to open the dropdown list of power options.
-Options are **Log Out** which logs you out of the SCALE UI but does not power off the system, **Restart** which logs you out of the SCALE UI and restarts the server, or **Shut Down** which logs you out of the SCALE UI and powers off the system as though you pressed the power button on the physical server.
+Options **Restart** which logs you out of the SCALE UI and restarts the server or **Shut Down** which logs you out of the SCALE UI and powers off the system as though you pressed the power button on the physical server.
 
-With the implementation of administrator roles, the power options displayed could be locked based on the level of privileges for the administrator role.
-The local administrator has access to all three power options.
-The **Read-Only** and **Sharing Manager** admin roles only have access to the **Log Out** option.
-The other power options display with a lock icon indicating the function is not permitted.
+With the implementation of administrator roles, the power options are locked based on the level of privileges for the administrator role.
+The full administrator has access to both power options but readonly and sharing admin roles do not.
+The power options that show a lock icon indicate the function is not permitted.
 {{< /expand >}}