On Thu, Feb 25, 2016 at 10:18:17AM +0100, Theo Buehler wrote:
> On Thu, Feb 25, 2016 at 08:53:34AM +0000, Jason McIntyre wrote:
> > On Thu, Feb 25, 2016 at 08:15:54AM +0100, Michal Mazurek wrote:
> > > boot(8) says: "As described in boot_amd64(8), this program is loaded by
> > > the biosboot(8)", but other than mentioning "/usr/mdec/biosboot"
> > > boot_amd64(8) does not describe biosboot(8). My attempt at a fix:
> > > 
> 
> Definitely a good idea.
> 
> > still the boot docs are too hairy for me. some oks for this,
> > please.
> 
> Here's a patch that can be applied directly from /usr/src implementing
> jmc@'s tweaks. I'd be strongly in favor of putting this in.
> 

ok, but one more pesky comma needed (well, in two places):

> Index: share/man/man8/man8.amd64/boot_amd64.8
> ===================================================================
> RCS file: /var/cvs/src/share/man/man8/man8.amd64/boot_amd64.8,v
> retrieving revision 1.8
> diff -u -p -r1.8 boot_amd64.8
> --- share/man/man8/man8.amd64/boot_amd64.8    20 Apr 2011 00:41:19 -0000      
> 1.8
> +++ share/man/man8/man8.amd64/boot_amd64.8    25 Feb 2016 09:08:31 -0000
> @@ -125,10 +125,11 @@ On most
>  .Ox
>  systems, booting
>  .Ox
> -from the BIOS will eventually load the
> +from the BIOS will load the
>  .Ox Ns -specific
> -amd64 bootstrapping code.
> -This versatile program is described in a separate document,
> +first-stage bootstrap,
> +.Xr biosboot 8 ,
> +which in turn will locate and load the second-stage bootstrap

again after "bootstrap" (here and below).
jmc

>  .Xr boot 8 .
>  Other bootstrapping software may be used, and can chain-load the
>  .Ox
> @@ -171,6 +172,7 @@ PXE bootstrap
>  .El
>  .Sh SEE ALSO
>  .Xr ddb 4 ,
> +.Xr biosboot 8 ,
>  .Xr boot 8 ,
>  .Xr halt 8 ,
>  .Xr init 8 ,
> Index: share/man/man8/man8.i386/boot_i386.8
> ===================================================================
> RCS file: /var/cvs/src/share/man/man8/man8.i386/boot_i386.8,v
> retrieving revision 1.16
> diff -u -p -r1.16 boot_i386.8
> --- share/man/man8/man8.i386/boot_i386.8      23 Jan 2014 12:49:12 -0000      
> 1.16
> +++ share/man/man8/man8.i386/boot_i386.8      25 Feb 2016 09:08:11 -0000
> @@ -125,10 +125,11 @@ On most
>  .Ox
>  systems, booting
>  .Ox
> -from the BIOS will eventually load the
> +from the BIOS will load the
>  .Ox Ns -specific
> -i386 bootstrapping code.
> -This versatile program is described in a separate document,
> +first-stage bootstrap,
> +.Xr biosboot 8 ,
> +which in turn will locate and load the second-stage bootstrap
>  .Xr boot 8 .
>  Other bootstrapping software may be used, and can chain-load the
>  .Ox
> @@ -171,6 +172,7 @@ PXE bootstrap
>  .El
>  .Sh SEE ALSO
>  .Xr ddb 4 ,
> +.Xr biosboot 8 ,
>  .Xr boot 8 ,
>  .Xr halt 8 ,
>  .Xr init 8 ,
> 

Reply via email to