summaryrefslogtreecommitdiffstats
path: root/mkinitcpio.5.txt
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-02-11 19:31:31 +0100
committerThomas Bächler <thomas@archlinux.org>2010-02-11 19:31:31 +0100
commit0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2 (patch)
tree31768b40897ce1d9ac3c2b22c1d8fcc89b6ecd23 /mkinitcpio.5.txt
parent1a91e4fa8e2d9823082843e98021c3345f82f072 (diff)
parentd67250f427937cb4b6f75b27d47d35302bd9890b (diff)
downloadmkinitcpio-0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2.tar.gz
mkinitcpio-0d755f3b5f96e9cf229c523cebcfb8c2379c1fd2.tar.xz
Merge branch 'kill-klibc'
Conflicts: Makefile
Diffstat (limited to 'mkinitcpio.5.txt')
-rw-r--r--mkinitcpio.5.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkinitcpio.5.txt b/mkinitcpio.5.txt
index 56e5eae..1c095dc 100644
--- a/mkinitcpio.5.txt
+++ b/mkinitcpio.5.txt
@@ -37,7 +37,7 @@ Options
Build initial ramdisk according to specified 'preset'. Presets are found in /etc/mkinitcpio.d
*-m* 'message'::
- Print 'message' before passing control to kinit.
+ Print 'message' before passing control to init.
*-S* 'hooks'::
Skip 'hooks' when generating the image. Several hooks should be comma-separated.
@@ -66,7 +66,7 @@ set up the udev device filesystem, load IDE modules, etc.
About Presets
-------------
-A preset is a pre-defined definition on how to create an initial ramdisk. Instead of specifying the configuration file and which output file, every time you generate a new intial ramdisk, you define a preset and use the -p switch to generate an initial ramdisk according to your preset. Presets are located in /etc/mkinitcpio.d
+A preset is a pre-defined definition on how to create an initial ramdisk. Instead of specifying the configuration file and which output file, every time you generate a new initial ramdisk, you define a preset and use the -p switch to generate an initial ramdisk according to your preset. Presets are located in /etc/mkinitcpio.d
Files
-----