mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Mention mergemaster(8).
Submitted by: obrien
This commit is contained in:
parent
1082b68736
commit
47f77d8c57
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=69111
@ -126,6 +126,7 @@ make buildworld
|
||||
make buildkernel KERNEL=FOO
|
||||
make installkernel KERNEL=FOO
|
||||
make installworld
|
||||
mergemaster
|
||||
.Ed
|
||||
.Pp
|
||||
.Dq FOO
|
||||
@ -157,6 +158,7 @@ may not work with the old kernel which is still running.
|
||||
.Xr make 1 ,
|
||||
.Xr make.conf 5 ,
|
||||
.Xr ports 7 ,
|
||||
.Xr mergemaster 8 ,
|
||||
.Xr reboot 8 ,
|
||||
.Xr shutdown 8
|
||||
.Sh AUTHORS
|
||||
|
Loading…
Reference in New Issue
Block a user