diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-25 13:15:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-25 13:15:50 +0000 |
| commit | 5d687f5a37b08ffb3af39f1fc475eba83078c761 (patch) | |
| tree | c13f03cf095cdb500c0e65e55da28f6d234af830 /usr/src/man/man5 | |
| parent | ce6a7649078ae9f0ae246da1fffb1343093388f2 (diff) | |
| parent | 8e6d016f3eedbcabf3a3bc35224bca733dc405a4 (diff) | |
| download | illumos-joyent-5d687f5a37b08ffb3af39f1fc475eba83078c761.tar.gz | |
[illumos-gate merge]
commit 8e6d016f3eedbcabf3a3bc35224bca733dc405a4
10234 uts: early start frame buffer console support
commit a016ad93bcf2a20e416da9f44cd299eb19ab4c08
10274 Some files built but not packaged on sparc
commit 0d640b6ed315cfedad6977d67f8dea20725d0b8d
10273 smatch should be corrected in exception_lists/packaging for sparc
commit 5352b2e7bbd3672bcc15645d9b8d18b207a3bfcc
10272 Manual pages added in 10212 should have been i386 only
commit 421a607f20240b957c77d8a5a6d34f13da0efb1e
10118 libeti() NULL check after deref
Conflicts:
usr/src/cmd/Makefile
Diffstat (limited to 'usr/src/man/man5')
| -rw-r--r-- | usr/src/man/man5/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/man/man5/Makefile b/usr/src/man/man5/Makefile index 18d2d6606f..471bd3641e 100644 --- a/usr/src/man/man5/Makefile +++ b/usr/src/man/man5/Makefile @@ -17,6 +17,7 @@ # Copyright 2016, Joyent, Inc. # Copyright 2018 Gary Mills # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 Peter Tribble # include $(SRC)/Makefile.master @@ -64,7 +65,6 @@ _MANFILES= Intro.5 \ inotify.5 \ ipfilter.5 \ isalist.5 \ - isoboot.5 \ kerberos.5 \ krb5_auth_rules.5 \ krb5envvar.5 \ @@ -145,6 +145,7 @@ i386_MANFILES= beastie.4th.5 \ color.4th.5 \ delay.4th.5 \ gptzfsboot.5 \ + isoboot.5 \ loader.5 \ loader.4th.5 \ menu.4th.5 \ |