diff options
| author | ben <ben@FreeBSD.org> | 2000-11-24 10:22:08 +0000 |
|---|---|---|
| committer | ben <ben@FreeBSD.org> | 2000-11-24 10:22:08 +0000 |
| commit | bef994a037f3fa442f18a0f79bfd85ca9eedc208 (patch) | |
| tree | f59d9c3ae7b0e43cef639724c14898d6744da603 /share/man/man7/build.7 | |
| parent | aedcd50082f71cd5cc88eebd3fb44c4ce6bd4a23 (diff) | |
| download | FreeBSD-src-bef994a037f3fa442f18a0f79bfd85ca9eedc208.zip FreeBSD-src-bef994a037f3fa442f18a0f79bfd85ca9eedc208.tar.gz | |
Mention mergemaster(8).
Submitted by: obrien
Diffstat (limited to 'share/man/man7/build.7')
| -rw-r--r-- | share/man/man7/build.7 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 075dcf8..0f74222 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -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 |
