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

Merge pull request from rened/master

Browse Source 
fixed some typos
This commit is contained in:
Domen Kožar 2014-11-14 14:31:55 +01:00
commit c347f1c26f
3 changed files with 3 additions and 3 deletions
nixos
doc/manual
configuration
linux-kernel.xml
installation
upgrading.xml
modules/system/activation
top-level.nix

2
nixos/doc/manual/configuration/linux-kernel.xml
View File

@ -56,7 +56,7 @@ root file system), you can use
boot.initrd.extraKernelModules = [ "cifs" ]; boot.initrd.extraKernelModules = [ "cifs" ];
</programlisting> </programlisting>
This causes the specified modules and their dependencies to be added This causes the specified modules and their dependencies to be added
to the initial ramdark.</para> to the initial ramdisk.</para>
<para>Kernel runtime parameters can be set through <para>Kernel runtime parameters can be set through
<option>boot.kernel.sysctl</option>, e.g. <option>boot.kernel.sysctl</option>, e.g.

2
nixos/doc/manual/installation/upgrading.xml
View File

@ -63,7 +63,7 @@ end.) For instance, to use the NixOS 14.04 stable channel:
$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos $ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
</screen> </screen>
But it you want to live on the bleeding edge: But if you want to live on the bleeding edge:
<screen> <screen>
$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos $ nix-channel --add http://nixos.org/channels/nixos-unstable nixos

2
nixos/modules/system/activation/top-level.nix
View File

@ -147,7 +147,7 @@ in
default = []; default = [];
description = '' description = ''
Additional configurations to build based on the current Additional configurations to build based on the current
configuration which is has a lower priority. configuration which then has a lower priority.
''; '';
}; };