Update boot and boot-conf descriptions to reflect new and old changes.

Add a warning in loader(8) that boot might be changed by loader.4th.

2 files changed, 31 insertions, 3 deletions

diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 4fb3158..0c885c0 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -151,6 +151,11 @@ if necessary.
 Any flags or arguments are passed to the kernel, but they
 must precede the kernel name, if a kernel name is provided.
 .Pp
+.Em WARNING:
+The behavior of this builtin is changed if
+.Xr loader.4th 8
+is loaded.
+.Pp
 .It Ic echo Xo
 .Op Fl n
 .Op Aq message
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 14d79a5..8717a73 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -64,13 +64,28 @@ This line is present on the default
 file, so it isn't needed (and should not be re-issued) in a normal setup.
 .Pp
 The commands provided by it are:
-.Bl -tag -width disable-module_module -offset indent
-.It Ic boot-conf
+.Bl -tag -width disable-module_module -compact -offset indent
+.It Ic boot
+.It Ic boot Ar kernelname Op Cm ...
+.It Ic boot Ar directory Op Cm ...
+.It Ic boot Fl flag Cm ...
 Boot as specified by the
 .Xr loader.conf 5
-files read. It uses
+files read.
+.Pp
+Depending on the arguments passed, it can override boot flags and
+either the kernel name or the search path for kernel and modules.
+.Pp
+.It Ic boot-conf
+.It Ic boot-conf Ar kernelname Op Cm ...
+.It Ic boot-conf Ar directory Op Cm ...
+.It Ic boot-conf Fl flag Cm ...
+Works like
+.Ic boot
+described above, but instead of booting immediately, uses
 .Ic autoboot ,
 so it can be stopped.
+.Pp
 .It Ic start
 Reads
 .Pa /boot/defaults/loader.conf ,
@@ -85,6 +100,7 @@ command (see
 .Xr loader 8 ),
 so it can be stopped for further interaction with
 .Xr loader 8 .
+.Pp
 .It Ic initialize
 Initialize the supporting library so commands can be used without
 executing
@@ -97,29 +113,36 @@ and all other
 .Xr loader.conf 5
 files specified in it. Returns a flag on the stack to indicate
 if any configuration file was succesfully loaded.
+.Pp
 .It Ic read-conf Ar filename
 Reads and processes a
 .Xr loader.conf 5
 file. Does not proceeds to boot.
+.Pp
 .It Ic enable-module Ar module
 Enables the loading of
 .Ar module .
+.Pp
 .It Ic disable-module Ar module
 Disables the loading of
 .Ar module .
+.Pp
 .It Ic toggle-module Ar module
 Toggles the loading of
 .Ar module
 on and off.
+.Pp
 .It Ic show-module Ar module
 Shows the information gathered in the
 .Xr loader.conf 5
 files about the module
 .Ar module .
+.Pp
 .It Ic retry
 Used inside
 .Xr loader.conf 5
 files to specify the action after a module loading fails.
+.Pp
 .It Ic ignore
 Used inside
 .Xr loader.conf 5