diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-04-19 16:04:24 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-04-19 16:04:27 -0400 |
| commit | 2d70679c470f43047fca8f4961628b78912d8041 (patch) | |
| tree | 0ca1cfc5cc9255466310885bdbd13554a9e66dd8 /usr/src/man/man4/Makefile | |
| parent | ced4e404c515b8735c4e6d563a547b9a8067c53c (diff) | |
| parent | 2b9481465d6ee67ac62c160dbf79c3ec3348c611 (diff) | |
| download | illumos-joyent-2d70679c470f43047fca8f4961628b78912d8041.tar.gz | |
[illumos-gate merge]
commit 2b9481465d6ee67ac62c160dbf79c3ec3348c611
13674 bhyve upstream sync 2021 March
Conflicts:
usr/src/cmd/bhyve/Makefile
usr/src/cmd/bhyve/bhyverun.c
Diffstat (limited to 'usr/src/man/man4/Makefile')
| -rw-r--r-- | usr/src/man/man4/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/man/man4/Makefile b/usr/src/man/man4/Makefile index 6a792597c2..ff28a7edd4 100644 --- a/usr/src/man/man4/Makefile +++ b/usr/src/man/man4/Makefile @@ -14,11 +14,12 @@ # Copyright 2015, Joyent, Inc. # Copyright 2018 Nexenta Systems, Inc. # Copyright 2018 Gary Mills +# Copyright 2021 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master -MANSECT= 4 +MANSECT= 4 _MANFILES= Intro.4 \ NISLDAPmapping.4 \ @@ -203,7 +204,8 @@ _MANFILES= Intro.4 \ sparc_MANFILES= sbus.4 -i386_MANFILES= loader.conf.4 \ +i386_MANFILES= bhyve_config.4 \ + loader.conf.4 \ sysbus.4 _MANLINKS= addresses.4 \ |