Hi Jason,

Jason McIntyre wrote on Sun, Jan 15, 2012 at 08:28:29AM +0000:

> ok, so perhaps the diff below will avoid future confusion.

I agree with adding that information and don't strongly object
to your wording, but given that fw_update(1) is just a wrapper
around pkg_add(1), some might consider it slightly misleading:
there is nothing wrong with using pkg_add(1) itself for updating
firmwares, as long as you specify the right PKG_PATH and options.

See inline for an alternative wording you might consider.

Regarding afterboot(8), i think your wording is fine.

Yours,
  Ingo


> Index: usr.sbin/pkg_add/pkg_add.1
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pkg_add/pkg_add.1,v
> retrieving revision 1.111
> diff -u -r1.111 pkg_add.1
> --- usr.sbin/pkg_add/pkg_add.1        23 Aug 2011 10:32:26 -0000      1.111
> +++ usr.sbin/pkg_add/pkg_add.1        15 Jan 2012 08:26:37 -0000
> @@ -68,6 +68,9 @@
>  option
>  .Fl u
>  .Pc .
> +A separate utility,
> +.Xr fw_update 1 ,
> +is used to update non-free firmware packages.

  Since non-free firmware packages are distributed via separate
  package repositories, the convenience wrapper
  .Xr fw_update 1
  is normally used to update them.

>  .Pp
>  Details of packing-list internals are documented in
>  .Xr pkg_create 1 .
> @@ -765,6 +768,7 @@
>  .El
>  .Sh SEE ALSO
>  .Xr ftp 1 ,
> +.Xr fw_update 1 ,
>  .Xr pkg_create 1 ,
>  .Xr pkg_delete 1 ,
>  .Xr pkg_info 1 ,
> Index: share/man/man8/afterboot.8
> ===================================================================
> RCS file: /cvs/src/share/man/man8/afterboot.8,v
> retrieving revision 1.135
> diff -u -r1.135 afterboot.8
> --- share/man/man8/afterboot.8        11 Jun 2011 17:52:00 -0000      1.135
> +++ share/man/man8/afterboot.8        15 Jan 2012 08:26:37 -0000
> @@ -614,11 +614,16 @@
>  impossible.
>  Sometimes checking the mailing lists for
>  past problems that people have encountered will result in a fix posted.
> +.Pp
> +Non-free firmware packages have their own tool for installing/updating,
> +.Xr fw_update 1 .
> +It is run automatically as part of the system upgrade.
>  .Ss Compiling a kernel
>  Information on building and modifying kernels
>  is contained within
>  .Xr config 8 .
>  .Sh SEE ALSO
> +.Xr fw_update 1 ,
>  .Xr ksh 1 ,
>  .Xr man 1 ,
>  .Xr pkg_add 1 ,

Reply via email to