Merge branch 'master' into PD-1610-update-docs-hub-and-security-hub-h…

…eader-footer-styling-to-match-parent-true-nas-com
truenas · Jan 6, 2025 · 1fbc359 · 1fbc359
2 parents e4625d1 + b1aee16
commit 1fbc359
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/content/SCALE/SCALETutorials/SystemSettings/Services/SSHServiceSCALE.md b/content/SCALE/SCALETutorials/SystemSettings/Services/SSHServiceSCALE.md
@@ -73,6 +73,8 @@ Remember to enable the SSH service in **System > Services** after making changes
 
 Create and store SSH connections and keypairs to allow SSH access in **Credentials > Backup Credentials** or by editing an administrative user account. See [Adding SSH Credentials]({{< relref "AddSSHConnectionKeyPair.md" >}}) for more information.
 
+TrueNAS shows an error if users activate Global 2FA (Two-Factor Authentication) and attempt to enable password-based SSH authentication without a 2FA token. See [Managing Global 2FA](https://www.truenas.com/docs/scale/scaletutorials/systemsettings/advanced/manageglobal2fascale/) for more information.
+
 ### Using SFTP Connections
 
 Open an FTP client (like FileZilla) or command line.

diff --git a/content/SCALE/SCALEUIReference/Apps/_index.md b/content/SCALE/SCALEUIReference/Apps/_index.md
@@ -108,15 +108,18 @@ The **Address Pools** shows the current IP address and subnet mask for the netwo
 **Base** shows the default IP address and subnet, and **Size** shows the network size of each docker network that is cut off from the base subnet.
 Select a predefined range from the dropdown list.
 
-**Install NVIDIA Drivers** shows if the system has an NVIDIA GPU installed. Select to enable TrueNAS to manually install drivers for this device.
-Systems with non-NVIDIA GPU devices do not show this option, but they are selectable in the app installation wizards in the **Resources Configuration** section for the app.
-
 {{< hint type="info" title="Apps Troubleshooting Tip!" >}}
 This setting replaces the Kubernetes Settings option for Bind Network in 24.04 and earlier.
 Use to resolve issues where apps experiences issues where TrueNAS device is not reachable from some networks.
 Select the network option, or add additional options to resolve the network connection issues.
 {{< /hint >}}
 
+**Install NVIDIA Drivers** shows if the system has an NVIDIA GPU installed.
+Select to enable TrueNAS to manually install drivers for this device.
+When the TrueNAS Debug Kernel is enabled, NVIDIA drivers are disabled.
+
+Systems with non-NVIDIA GPU devices do not show this option, but these GPUs are selectable in the app installation wizards in the **Resources Configuration** section for the app.
+
 **Check for docker image updates** sets TrueNAS to check for docker image updates (default setting). 
 
 ## Applications Table

diff --git a/content/SCALE/SCALEUIReference/SystemSettings/AdvancedSettingsScreen.md b/content/SCALE/SCALEUIReference/SystemSettings/AdvancedSettingsScreen.md
@@ -110,7 +110,7 @@ The **Kernel** widget shows options for configuring the Linux kernel installed w
 {{< truetable >}}
 | Settings | Description |
 |----------|-------------|
-| **Enable Debug Kernel** | Set to boot a debug kernel after the next system reboot. |
+| **Enable Debug Kernel** | Set to boot a debug kernel after the next system reboot. This is intended for troubleshooting scenarios only and should typically remain disabled. Enabling this option disables any Nvidia drivers present on the system. |
 {{< /truetable >}}
 {{< /expand >}}