Merge pull request #34128 from teto/doc_simple

Doc: simple precisions

Changed files
+8 -4
nixos
doc
manual
installation
modules
config
programs
zsh
+4 -1
nixos/doc/manual/installation/installing.xml
···
using <command>ifconfig</command>.</para>
<para>To manually configure the network on the graphical installer,
first disable network-manager with
-
<command>systemctl stop network-manager</command>.</para></listitem>
+
<command>systemctl stop network-manager</command>.</para>
+
<para>To manually configure the wifi on the minimal installer, run
+
<command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.</para></listitem>
+
<listitem><para>If you would like to continue the installation from a different
machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
+1 -1
nixos/modules/config/shells-environment.nix
···
default = {};
description = ''
A set of environment variables used in the global environment.
-
These variables will be set on shell initialisation.
+
These variables will be set on shell initialisation (e.g. in /etc/profile).
The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon
characters.
+3 -2
nixos/modules/programs/zsh/zsh.nix
···
shellAliases = mkOption {
default = config.environment.shellAliases;
description = ''
-
Set of aliases for zsh shell. See <option>environment.shellAliases</option>
-
for an option format description.
+
Set of aliases for zsh shell. Overrides the default value taken from
+
<option>environment.shellAliases</option>.
+
See <option>environment.shellAliases</option> for an option format description.
'';
type = types.attrs; # types.attrsOf types.stringOrPath;
};