diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-17 12:57:34 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-17 12:57:34 +0000 |
| commit | 4eeb8089d22a777b919f608ca4fb5c090d2eea84 (patch) | |
| tree | dcdcf0e8c101652ddec644746142517b939bab0a /usr/src/man/man5 | |
| parent | a947aa5f9e3d25d6638e832f6ef7015d604e3a2e (diff) | |
| parent | c8cc685318cb78c62f1ff07bc561b26d65780aa3 (diff) | |
| download | illumos-joyent-4eeb8089d22a777b919f608ca4fb5c090d2eea84.tar.gz | |
[illumos-gate merge]
commit c8cc685318cb78c62f1ff07bc561b26d65780aa3
10225 wsdiff broken after 9979
commit ead1aeb99fc825309962c1dc2f20333bdd5898f6
10195 uts: boot_keyboard should emit esc sequences for arrow keys
commit 9f17ecf0b8fdc59cfa903ceb6a96046b0f2d8201
10229 Some man pages have incorrect cross-references
commit 1bf8e91c2f089f0b4e9a6f705f162654aa82cfad
10232 beastie.4th manpage not shipped
commit 0b4d657578b8f707371421ebae5b3837023b4144
8235 fwflash for sd needs to handle partial writes
8236 fwflash sd plugin shouldn't hardcode maximum image size
8237 libscsi improperly translates request sense and isolate options to uscsi
Conflicts:
usr/src/man/man7i/uscsi.7i
usr/src/cmd/fwflash/plugins/transport/common/sd.c
Diffstat (limited to 'usr/src/man/man5')
| -rw-r--r-- | usr/src/man/man5/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/man/man5/pam_timestamp.5 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/man/man5/Makefile b/usr/src/man/man5/Makefile index 8e582ade35..18d2d6606f 100644 --- a/usr/src/man/man5/Makefile +++ b/usr/src/man/man5/Makefile @@ -16,6 +16,7 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016, Joyent, Inc. # Copyright 2018 Gary Mills +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include $(SRC)/Makefile.master @@ -138,7 +139,8 @@ _MANFILES= Intro.5 \ sparc_MANFILES= -i386_MANFILES= brand.4th.5 \ +i386_MANFILES= beastie.4th.5 \ + brand.4th.5 \ check-password.4th.5 \ color.4th.5 \ delay.4th.5 \ diff --git a/usr/src/man/man5/pam_timestamp.5 b/usr/src/man/man5/pam_timestamp.5 index cb6d2b766b..aae2aba27f 100644 --- a/usr/src/man/man5/pam_timestamp.5 +++ b/usr/src/man/man5/pam_timestamp.5 @@ -54,7 +54,7 @@ be stacked above .Bl -tag -width Ds .It Dv debug Provides -.Xr syslog 3 +.Xr syslog 3C debugging information at the .Sy LOG_AUTH | LOG_DEBUG level. |