Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: MicJ <92740932+micjohnson777@users.noreply.github.com>
  • Loading branch information
DjP-iX and micjohnson777 committed Nov 22, 2023
1 parent 1b66e32 commit 3653228
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion content/CORE/CORETutorials/SettingUpUsersAndGroups.md
Expand Up @@ -80,7 +80,7 @@ The account can't use password-based logins for services.
For example, disabling the password prevents using account credentials to log in to an SMB share or open an SSH session on the system.
By default, **Disable Password** is *No*.

A specific [shell]({{< relref "ChangingDefaultShell.md" >}}) can be set for the user from the **Shell** drop-down:
You can set a specific [shell]({{< relref "ChangingDefaultShell.md" >}}) for the user from the **Shell** dropdown:

{{< expand "Shell Options" "v" >}}
{{< include file="_includes/COREshellOptions.md" >}}
Expand Down
Expand Up @@ -30,7 +30,7 @@ Enter an over-provision value corresponding to the new size in GB in the **Log (
![StoragePoolsOptionSLOGOverprovision](/images/CORE/Storage/StoragePoolsOptionsLogOverprovision.png "")

When this value is applied, the over-provision value is applied whenever a pool is created with a SLOG device.
It is impossible to restore an over-provisioned SLOG device back to original capacity without running the command `disk_resize` after first destroying the pool it was part of and issuing a full power cycle.
It is impossible to restore an over-provisioned SLOG device back to original capacity without running the `disk_resize` command after first destroying the pool it was part of and issuing a full power cycle.

{{< hint type=note >}}
Only one over-provision/under-provision operation occurs per power cycle.
Expand Down
Expand Up @@ -19,8 +19,8 @@ TrueNAS generates and stores [RSA-encrypted](https://tools.ietf.org/html/rfc8017
The system typically uses keypairs when configuring **SSH Connections** or SFTP **Cloud Credentials**.
Encrypted keypairs or keypairs with passphrases are not supported.

The creation of a new **SSH Connection** or **Replication** task generates new keypairs.
To manually generate a new keypair, go to **System > SSH Keypairs**, click **ADD**, and give the keypair a unique **Name**.
Creating a new **SSH Connection** or **Replication** task generates new keypairs.
To manually generate a new keypair, go to **System > SSH Keypairs**, click **ADD**, and give the keypair a unique name.

![System SSH Keypairs Add](/images/CORE/System/SystemSSHKeypairsAdd.png "System SSH Keypairs Add")

Expand All @@ -42,8 +42,8 @@ Go to **System > SSH Connections** and click **ADD**.
![SystemSSHConnectionsAddSemiAuto](/images/CORE/System/SystemSSHConnectionsAddSemiAuto.png "Semi-Auto Connection")

Use a valid URL scheme for the remote TrueNAS URL.
Leave the username as *root* and enter the account password for the remote TrueNAS system.
You can import the private key from an SSH keypair that you created before. Or create a new private key with a new SSH keypair.
Leave the username as **root** and enter the account password for the remote TrueNAS system.
You can import the existing private key created from an SSH keypair, or create a new private key with a new SSH keypair.

Save the new configuration. TrueNAS opens a connection to the remote TrueNAS and exchanges SSH keys.

Expand Down
4 changes: 2 additions & 2 deletions content/CORE/CORETutorials/Tasks/CreatingRsyncTasks.md
Expand Up @@ -59,7 +59,7 @@ To create the connection, go to **System > SSH Connections** and click **ADD**.
Configure a **Semi-automatic** connection and from the **Private Key** dropdown list select **Generate New**.

{{< expand "Can this be set up in a command line instead?" "v" >}}
Go to the shell on the **Host** system.
Go to the shell on the system entered in the **Host** field.
When a TrueNAS account other than *root* manages the rsync task, enter `su - USERNAME`, where *USERNAME* is the TrueNAS user account that runs the rsync task.
Enter `ssh-keygen -t rsa` to create the key pair.
When prompted for a password, press <kbd>Enter</kbd> without setting a password (a password breaks the automated task).
Expand Down Expand Up @@ -96,7 +96,7 @@ Click **EDIT** and paste the key into **SSH Public Key**.

Next, copy the host key from the **Remote** system to the **Host** system user <file>.ssh/known_hosts</file> directory, using `ssh-keyscan`.

On the **Host** system, open the shell and enter `ssh-keyscan -t rsa {remoteIPaddress} >> {userknown_hostsDir}` where *remoteIPaddress* is the **Remote** system IP address and *userknown_hostsDir* is the <file>known_hosts</file> directory on the **Host** system.
On the host system, open the shell and enter <code>ssh-keyscan -t rsa <em>remoteIPaddress</em> >> <em>userknown_hostsDir</em></code> where *remoteIPaddress* is the **Remote** system IP address and *userknown_hostsDir* is the <file>known_hosts</file> directory on the host system.
Example: `ssh-keyscan -t rsa 192.168.2.6 >> /root/.ssh/known_hosts`.
{{< /expand >}}

Expand Down
4 changes: 2 additions & 2 deletions content/CORE/GettingStarted/ConsoleSetupMenu.md
Expand Up @@ -13,7 +13,7 @@ If the TrueNAS system has a keyboard and monitor, this menu can be used to admin
When connecting with SSH, the Console Setup menu is not shown by default.
It can be started by the `root` user or another user with root permissions by entering `/etc/netcli`.

To disable the Console Setup menu, go to **System > Advanced** and unset **Show Text Console without Password Prompt**.
To disable the Console Setup menu, go to **System > Advanced** and select **Show Text Console without Password Prompt** to clear the checkbox.

![ConsoleSetupMenu](/images/CORE/ConsoleSetupMenu.png "TrueNAS Console Setup Menu")

Expand All @@ -37,7 +37,7 @@ The menu provides these options:

8) **Reset Configuration to Defaults** *Caution!* This option deletes all of the configuration settings made in the administrative GUI and is used to reset TrueNAS® back to defaults. Before selecting this option, make a full backup of all data and make sure all encryption keys and passphrases are known! After this option is selected, the configuration is reset to defaults and the system reboots. Storage ➞ Pools ➞ Import Pool can be used to re-import pools.

9) **Reboot** reboots the system.
9) **Reboot** restarts the system.

10) **Shut Down** shuts down the system.

Expand Down
Expand Up @@ -10,7 +10,7 @@ The Jails screen displays a list of jails installed on your system. Use to add,

![JailsScreen](/images/CORE/Jails/JailsScreen.png "Jails Screen")

Use the blue **Columns** dropdown list to display options to change the information displayed in the list of tables. Options are Select **All**, **JID**, **Boot**, **State**, **Release**, **IPv4**, **IPv6**, **Type**, **Template**, **Basejail** or **Reset to Defaults**.
Use the blue **Columns** dropdown list to display options to change the information displayed in the list of tables. Options are **Select All**, **JID**, **Boot**, **State**, **Release**, **IPv4**, **IPv6**, **Type**, **Template**, **Basejail** or **Reset to Defaults**.

Use the <span class="material-icons">settings</span> icon to set the pool to use for jail storage.

Expand Down
Expand Up @@ -27,7 +27,7 @@ The **Wizard** consists of six individual configuration screens.

**Confirmation Options** displays the summary of settings. You can use **BACK** to return to previous screens to make changes or use **SUBMIT** to save settings and create the virtual machine.

After saving the VM, if you want to make changes you can select the VM on the list, expand it and select **EDIT** to make changes.
To make changes after saving the VM, select the VM on the list, expand it, and select **EDIT**.

### VM Wizard Navigation
You cannot advance to the next screen if the current screen has required fields.
Expand Down

0 comments on commit 3653228

Please sign in to comment.