Removed/changed messages/comments about klibc/kinit

Also remove comment about "modload" in conf.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Signed-off-by: Thomas Bächler <thomas@archlinux.org>

3 files changed, 5 insertions, 7 deletions

diff --git a/mkinitcpio b/mkinitcpio
index 999901d..0865482 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -1,10 +1,9 @@
 #!/bin/bash
 # mkinitcpio - modular tool for building an init ramfs cpio image
 #
-# IMPORTANT: We need to keep a common base syntax here
-# because some of these hooks/scripts need to run under
-# the klibc shell or even busybox's ash - therefore, the
-# following constraints should be enforced:
+# IMPORTANT: We need to keep a common base syntax here because
+# some of these hooks/scripts need to run under busybox's ash -
+# therefore, the following constraints should be enforced:
 #   variables should be quoted and bracketed "${SOMEVAR}"
 #   inline execution should be done with $() instead of backticks
 #   use -z "${var}" to test for nulls/empty strings
@@ -54,7 +53,7 @@ usage ()
     echo "  -g IMAGE         Generate a cpio image as IMAGE. default: no"
     echo "  -a NAME          Append to an existing filelist. default: no"
     echo "  -p PRESET        Build specified preset."
-    echo "  -m MESSAGE       Print MESSAGE before passing control to kinit."
+    echo "  -m MESSAGE       Print MESSAGE before passing control to init."
     echo "  -S SKIPHOOKS     Skip SKIPHOOKS (comma-separated) when building the image."
     echo "  -v               Verbose output. Default: no"
     echo "  -M               Display modules found via autodetection." 
diff --git a/mkinitcpio.5.txt b/mkinitcpio.5.txt
index 3b70f6c..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.
diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index 7b2c98c..781d64a 100644
--- a/mkinitcpio.conf
+++ b/mkinitcpio.conf
@@ -30,7 +30,6 @@ FILES=""
 # help on a given hook.
 # 'base' is _required_ unless you know precisely what you are doing.
 # 'udev' is _required_ in order to automatically load modules
-# 'modload' may be used in place of 'udev', but is not recommended
 # 'filesystems' is _required_ unless you specify your fs modules in MODULES
 # Examples:
 #    This setup specifies all modules in the MODULES setting above.