[illumos-gate merge]

commit 371584c2eae4cf827fd406ba26c14f021adaaa70
    7243 update mdocml to 1.13.4
commit 7a8b8fd18ff115f0caa89183db5373afb568b630
    5166 sendmail package should be replaceable (followup)

1 files changed, 22 insertions, 10 deletions

diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index cc7396d72d..ee2f46b317 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -101,12 +101,14 @@ usr/src/cmd/krb5/slave/kprop.h
 usr/src/cmd/krb5/slave/kpropd.c
 usr/src/cmd/mandoc/att.c
 usr/src/cmd/mandoc/chars.c
-usr/src/cmd/mandoc/compat_fgetln.c
+usr/src/cmd/mandoc/compat_ohash.c
+usr/src/cmd/mandoc/compat_ohash.h
 usr/src/cmd/mandoc/compat_reallocarray.c
+usr/src/cmd/mandoc/compat_strtonum.c
 usr/src/cmd/mandoc/config.h
-usr/src/cmd/mandoc/eqn.c
 usr/src/cmd/mandoc/eqn_html.c
 usr/src/cmd/mandoc/eqn_term.c
+usr/src/cmd/mandoc/eqn.c
 usr/src/cmd/mandoc/html.c
 usr/src/cmd/mandoc/html.h
 usr/src/cmd/mandoc/lib.c
@@ -116,43 +118,53 @@ usr/src/cmd/mandoc/libmdoc.h
 usr/src/cmd/mandoc/libroff.h
 usr/src/cmd/mandoc/main.c
 usr/src/cmd/mandoc/main.h
-usr/src/cmd/mandoc/man.c
-usr/src/cmd/mandoc/man.h
 usr/src/cmd/mandoc/man_hash.c
 usr/src/cmd/mandoc/man_html.c
 usr/src/cmd/mandoc/man_macro.c
 usr/src/cmd/mandoc/man_term.c
 usr/src/cmd/mandoc/man_validate.c
+usr/src/cmd/mandoc/man.c
+usr/src/cmd/mandoc/man.h
+usr/src/cmd/mandoc/manconf.h
+usr/src/cmd/mandoc/mandoc_aux.c
+usr/src/cmd/mandoc/mandoc_aux.h
+usr/src/cmd/mandoc/mandoc_ohash.c
+usr/src/cmd/mandoc/mandoc_ohash.h
 usr/src/cmd/mandoc/mandoc.c
 usr/src/cmd/mandoc/mandoc.h
-usr/src/cmd/mandoc/mandoc_aux.c
 usr/src/cmd/mandoc/manpath.c
-usr/src/cmd/mandoc/mdoc.c
-usr/src/cmd/mandoc/mdoc.h
+usr/src/cmd/mandoc/mansearch.h
 usr/src/cmd/mandoc/mdoc_argv.c
 usr/src/cmd/mandoc/mdoc_hash.c
 usr/src/cmd/mandoc/mdoc_html.c
 usr/src/cmd/mandoc/mdoc_macro.c
 usr/src/cmd/mandoc/mdoc_man.c
+usr/src/cmd/mandoc/mdoc_state.c
 usr/src/cmd/mandoc/mdoc_term.c
 usr/src/cmd/mandoc/mdoc_validate.c
+usr/src/cmd/mandoc/mdoc.c
+usr/src/cmd/mandoc/mdoc.h
 usr/src/cmd/mandoc/msec.c
 usr/src/cmd/mandoc/out.c
 usr/src/cmd/mandoc/out.h
 usr/src/cmd/mandoc/preconv.c
 usr/src/cmd/mandoc/read.c
+usr/src/cmd/mandoc/roff_int.h
 usr/src/cmd/mandoc/roff.c
+usr/src/cmd/mandoc/roff.h
 usr/src/cmd/mandoc/st.c
-usr/src/cmd/mandoc/tbl.c
+usr/src/cmd/mandoc/tag.c
+usr/src/cmd/mandoc/tag.h
 usr/src/cmd/mandoc/tbl_data.c
 usr/src/cmd/mandoc/tbl_html.c
 usr/src/cmd/mandoc/tbl_layout.c
 usr/src/cmd/mandoc/tbl_opts.c
 usr/src/cmd/mandoc/tbl_term.c
-usr/src/cmd/mandoc/term.c
-usr/src/cmd/mandoc/term.h
+usr/src/cmd/mandoc/tbl.c
 usr/src/cmd/mandoc/term_ascii.c
 usr/src/cmd/mandoc/term_ps.c
+usr/src/cmd/mandoc/term.c
+usr/src/cmd/mandoc/term.h
 usr/src/cmd/mandoc/tree.c
 usr/src/common/bzip2/bzlib.h
 usr/src/common/bzip2/crctable.c