diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/configuration/linux-kernel.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/installation/upgrading.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 8fe2f5255df3..ffd7b354efe1 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -56,7 +56,7 @@ root file system), you can use boot.initrd.extraKernelModules = [ "cifs" ]; </programlisting> 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 <option>boot.kernel.sysctl</option>, e.g. diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index ed71a7e23a30..e4e21603329d 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -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 </screen> -But it you want to live on the bleeding edge: +But if you want to live on the bleeding edge: <screen> $ nix-channel --add http://nixos.org/channels/nixos-unstable nixos diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 62999dceee39..b8ea7fd7b9ad 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -147,7 +147,7 @@ in default = []; description = '' Additional configurations to build based on the current - configuration which is has a lower priority. + configuration which then has a lower priority. ''; }; |