Merging upstream version 103.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 20 insertions, 23 deletions

diff --git a/man/dracut-catimages.8.asc b/man/dracut-catimages.8.asc
index 8ddc365..f3c74a9 100644
--- a/man/dracut-catimages.8.asc
+++ b/man/dracut-catimages.8.asc
@@ -56,4 +56,3 @@ link:$$https://github.com/dracut-ng/dracut-ng$$[https://github.com/dracut-ng/dra
 SEE ALSO
 --------
 *dracut*(8)
-
diff --git a/man/dracut.8.asc b/man/dracut.8.asc
index 25f601b..77a4a8a 100644
--- a/man/dracut.8.asc
+++ b/man/dracut.8.asc
@@ -211,7 +211,8 @@ example:
 ===============================
 
 **--kernel-cmdline <parameters>**::
-    Specify default kernel command line parameters.
+    Specify default kernel command line parameters. Despite its name,
+    this command only sets initrd parameters.
 
 **--kernel-only**::
     Only install kernel drivers and firmware files.
diff --git a/man/dracut.asc b/man/dracut.asc
index c806ab2..8caf8d5 100644
--- a/man/dracut.asc
+++ b/man/dracut.asc
@@ -130,19 +130,19 @@ procedure.
 
 The following steps are executed during a shutdown:
 
-* systemd switches to the shutdown.target
-* systemd starts
-  $prefix/lib/systemd/system/shutdown.target.wants/dracut-shutdown.service
-* dracut-shutdown.service executes /usr/lib/dracut/dracut-initramfs-restore
-  which unpacks the initramfs to /run/initramfs
-* systemd finishes shutdown.target
+* The system starts to shut down
+* ``$prefix/lib/systemd/system/sysinit.target.wants/dracut-shutdown.service``
+  gets its ``ExecStop`` target triggered.
+* ``dracut-shutdown.service`` executes
+  ``/usr/lib/dracut/dracut-initramfs-restore`` which unpacks the initramfs to
+  ``/run/initramfs``
 * systemd kills all processes
 * systemd tries to unmount everything and mounts the remaining read-only
-* systemd checks, if there is a /run/initramfs/shutdown executable
-* if yes, it does a pivot_root to /run/initramfs and executes ./shutdown.
-  The old root is then mounted on /oldroot.
-  /usr/lib/dracut/modules.d/99shutdown/shutdown.sh is the shutdown executable.
-* shutdown will try to unmount every /oldroot mount and calls the various
+* systemd checks if there is a ``/run/initramfs/shutdown`` executable
+* if yes, it does a pivot_root to ``/run/initramfs`` and executes ``./shutdown``.
+  The old root is then mounted on ``/oldroot``.
+  ``/usr/lib/dracut/modules.d/99shutdown/shutdown.sh`` is the shutdown executable.
+* shutdown will try to unmount every ``/oldroot`` mount and calls the various
   shutdown hooks from the dracut modules
 
 This ensures, that all devices are disassembled and unmounted cleanly.
@@ -179,4 +179,3 @@ This work is licensed under the Creative Commons Attribution/Share-Alike
 License. To view a copy of this license, visit
 http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
 Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-
diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc
index 7c0051e..1f4973e 100644
--- a/man/dracut.cmdline.7.asc
+++ b/man/dracut.cmdline.7.asc
@@ -452,8 +452,8 @@ when not needed anymore.
 ===============================
 
 **rd.luks.key.tout=0**::
-    specify how many times dracut will try to read the keys specified in in
-    rd.luk.key. This gives a chance to the removable device containing the key
+    specify how many times dracut will try to read the keys specified in
+    rd.luks.key. This gives a chance to the removable device containing the key
     to initialise.
 
 MD RAID
diff --git a/man/dracut.conf.5.asc b/man/dracut.conf.5.asc
index dd42891..5ca07a0 100644
--- a/man/dracut.conf.5.asc
+++ b/man/dracut.conf.5.asc
@@ -184,7 +184,8 @@ provide a valid _/etc/fstab_.
     Mount _/_ and _/usr_ read-only by default (default=no).
 
 *kernel_cmdline=*"__parameters__"::
-    Specify default kernel command line parameters.
+    Specify default kernel command line parameters. Despite
+    its name, this command only sets initrd parameters.
 
 *kernel_only=*"__{yes|no}__"::
     Only install kernel drivers and firmware files (default=no).
@@ -344,4 +345,3 @@ Harald Hoyer
 See Also
 --------
 *dracut*(8) *dracut.cmdline*(7)
-
diff --git a/man/dracut.modules.7.asc b/man/dracut.modules.7.asc
index 0f33bd7..c2fcf51 100644
--- a/man/dracut.modules.7.asc
+++ b/man/dracut.modules.7.asc
@@ -25,7 +25,7 @@ arguments and sets up the directory, in which everything is installed. It then
 executes all check, install, installkernel scripts found in the modules, which
 are to be processed. After everything is installed, the install directory is
 archived and compressed to the final initramfs image. All helper functions used
-by check, install and installkernel are found in in the file _dracut-functions_.
+by check, install and installkernel are found in the file _dracut-functions_.
 These shell functions are available to all module installer (install,
 installkernel) scripts, without the need to source _dracut-functions_.
 
diff --git a/man/dracut.usage.asc b/man/dracut.usage.asc
index 3b652d3..ba9c2da 100644
--- a/man/dracut.usage.asc
+++ b/man/dracut.usage.asc
@@ -38,9 +38,8 @@ the --hostonly or -H option. Using this option, the resulting image will
 contain only those dracut modules, kernel modules and filesystems, which are
 needed to boot this specific machine. This has the drawback, that you can't put
 the disk on another controller or machine, and that you can't switch to another
-root filesystem, without recreating the initramfs image. The usage of the
---hostonly option is only for experts and you will have to keep the broken
-pieces. At least keep a copy of a general purpose image (and corresponding
+root filesystem, without recreating the initramfs image.
+It is recommended to keep a copy of a general purpose image (and corresponding
 kernel) as a fallback to rescue your system.
 
 === Inspecting the Contents
@@ -517,4 +516,3 @@ To do this from an already booted system:
 
 This will give you a dracut shell after the system pivot'ed back in the
 initramfs.
-