public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34128 from teto/doc_simple 

Doc: simple precisions
This commit is contained in:
Graham Christensen 2018-01-21 22:40:36 -05:00 committed by GitHub
parent d585a3207b 8b9429008e
commit 931a0b8be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/installation/installing.xml
View File

@ -45,7 +45,10 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
using <command>ifconfig</command>.</para> using <command>ifconfig</command>.</para>
<para>To manually configure the network on the graphical installer, <para>To manually configure the network on the graphical installer,
first disable network-manager with 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 <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>. machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.

2
nixos/modules/config/shells-environment.nix
View File

@ -36,7 +36,7 @@ in
default = {}; default = {};
description = '' description = ''
A set of environment variables used in the global environment. 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 The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon strings. The latter is concatenated, interspersed with colon
characters. characters.

5
nixos/modules/programs/zsh/zsh.nix
View File

@ -36,8 +36,9 @@ in
shellAliases = mkOption { shellAliases = mkOption {
default = config.environment.shellAliases; default = config.environment.shellAliases;
description = '' description = ''
Set of aliases for zsh shell. See <option>environment.shellAliases</option> Set of aliases for zsh shell. Overrides the default value taken from
for an option format description. <option>environment.shellAliases</option>.
See <option>environment.shellAliases</option> for an option format description.
''; '';
type = types.attrs; # types.attrsOf types.stringOrPath; type = types.attrs; # types.attrsOf types.stringOrPath;
}; };