Merge branch 'master' into wip-tests

contrib/debian/finit.d/available/Makefile.am

@@ -1,5 +1,5 @@
 docsdir   := @docdir@/contrib/debian/finit.d/available
-docs_DATA  = acpid.conf console-setup.conf getty.conf		\
+docs_DATA  = acpid.conf console-setup.conf getty.conf keyboard-setup.conf \
-             keyboard-setup.conf lightdm.conf modules.conf	\
+	     lightdm.conf modules.conf ntpclient.conf rsyslogd.conf 	  \
-             ntpclient.conf rsyslogd.conf sshd.conf xdm.conf
+	     sshd.conf syslogd.conf xdm.conf
 EXTRA_DIST = $(docs_DATA)

contrib/debian/finit.d/available/syslogd.conf

@@ -0,0 +1,2 @@
+# Start sysklogd as soon as possible, should always run if enabled
+service [S123456789] syslogd -sF -r 10M:10 -- System logging daemon

doc/cmdline.md

@@ -7,41 +7,40 @@ passed on the Linux kernel command line.  Not limited to Finit.
 The `bool` setting is one of `on, off, true false, 1, 0`.
 
 
-* `debug`__
+* `debug`: Enable kernel debug.  Debug messages are printed to the
-    Enable kernel debug.  Debug messages are printed to the console
+    console until Finit starts up.
-    until Finit starts up.
 
-* `finit.debug[=bool]`
+* `finit.debug[=bool]`: Enable finit debug.  This is operated
-    Enable finit debug.  This is operated independently of the kerne
+	independently of the kernel debug setting.  New as of Finit v4.
-	debug setting.  New as of Finit v4.
 
-* `finit.show_status[=bool]`
+* `finit.show_status[=bool]`: Control finit boot progress, including
-    Control finit boot progress, including banner.
+  banner.
 
-* `finit.status_style=<classic,modern>`
+* `finit.status_style=<classic,modern>`: Set Finit boot progress style,
-    Set Finit boot progress style, when enabled.
+  when enabled.
 
-* `init=/bin/sh`  
+* `init=/bin/sh`: Bypass system default init and tell kernel to start a
-    Bypass system default init and tell kernel to start a shell.  Note,
+	shell.  Note, this shell is very limited and does not support
-	this shell is very limited and does not support signals and has no
+	signals and has no job control.  Recommend using, and modifying,
-	job control.  Recommend using, and modifying, `rescue` mode instead.
+	`rescue` mode instead.
 
-* `panic=SEC`  
+* `panic=SEC`: By default the kernel does not reboot after a kernel
-    By default the kernel does not reboot after a kernel panic.  This
+    panic.  This setting will cause a kernel reboot after SEC seconds.
-    setting will cause a kernel reboot after SEC seconds.
 
-* `quiet`  
+* `quiet`: Suppress kernel logging to console, except for warnings and
-    Suppress kernel logging to console, except for warnings and errors.
+  errors.
 
-* `rescue`  
+* `rescue`: Start Finit rescue mode; no network, no `fsck` of file
-    Start Finit rescue mode; no network, no `fsck` of file systems in
+    systems in `/etc/fstab`, no `/etc/rc.local`, no `runparts`.  The
-    `/etc/fstab`, no `/etc/rc.local`, no `runparts`.  The configuration
+    configuration is read from `/lib/finit/rescue.conf`, and can be
-    is read from `/etc/rescue.conf`, can be modified by the operator.
+    modified by the operator.
 
-* `single`, or `S`  
+* `single`, or `S`: Single user mode, runlevel 1, in Finit.  Useful to
-    Single user mode, runlevel 1, in Finit.  Useful to debug problems with
+    debug problems with the regular runlevel.  All services and TTYs in
-    the regular runlevel.  All services and TTYs in `[1]` will be started,
+    `[1]` will be started, so a `tty [1] @console nologin` configuration
-    so a `tty [1] @console nologin` configuration presents you with a
+    presents you with a root console without login.
-    root console without login.
 
-For more on kernel boot paramaters, see the man page `bootparam(7)`.
+For more on kernel boot paramaters, see the man page [bootparam(7)][].
+
+
+[bootparam(7)]: https://www.man7.org/linux/man-pages/man7/bootparam.7.html