summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorRene Donner <code@donner.at>2014-11-14 13:05:55 +0100
committerRene Donner <code@donner.at>2014-11-14 13:05:55 +0100
commit8bd2f6bfc13e190266b61152a5c1444a4899415e (patch)
treeaddb328062ae89ed3a2524a830b8bcec82bb9d6b /nixos/doc
parent18ffe551e833ef4a391127f2b7c97b6cbb2ac187 (diff)
downloadnixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar.gz
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar.bz2
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar.lz
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar.xz
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.tar.zst
nixlib-8bd2f6bfc13e190266b61152a5c1444a4899415e.zip
some typos
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/configuration/linux-kernel.xml2
-rw-r--r--nixos/doc/manual/installation/upgrading.xml2
2 files changed, 2 insertions, 2 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