===================================================================
RCS file: /cvs/mandoc/mandoc_headers.3,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -p -r1.1 -r1.3
--- mandoc/mandoc_headers.3	2014/12/01 08:09:26	1.1
+++ mandoc/mandoc_headers.3	2015/03/27 17:37:25	1.3
@@ -47,7 +47,7 @@ HTML formatters
 search tools
 .El
 .Pp
-Note that mere usage of an opaque type does
+Note that mere usage of an opaque struct type does
 .Em not
 require inclusion of the header where that type is defined.
 .Ss Parser interface
@@ -204,7 +204,11 @@ are included, the same file should not include any for
 Requires
 .In sys/types.h
 for
-.Vt size_t .
+.Vt size_t
+and
+.Qq Pa mandoc.h
+for
+.Vt enum mandocerr .
 .Pp
 Provides
 .Vt enum rofferr ,
@@ -222,8 +226,7 @@ from
 .Pa roff.c
 for function prototypes.
 Uses the types
-.Vt enum mandocerr ,
-.Vt struct tbl_span ,
+.Vt struct tbl_span
 and
 .Vt struct eqn
 from
@@ -363,8 +366,6 @@ from
 as an opaque type for function prototypes.
 .Pp
 When this header is included, the same file should not include
-.Pa manpath.h
-or
 .Pa mansearch.h .
 .It Qq Pa term.h
 Requires
@@ -403,8 +404,7 @@ from
 as opaque types for function prototypes.
 .Pp
 When this header is included, the same file should not include
-.Pa html.h ,
-.Pa manpath.h
+.Pa html.h
 or
 .Pa mansearch.h .
 .It Qq Pa html.h
@@ -438,8 +438,7 @@ from
 .Pa chars.c .
 .Pp
 When this header is included, the same file should not include
-.Pa term.h ,
-.Pa manpath.h
+.Pa term.h
 or
 .Pa mansearch.h .
 .It Qq Pa main.h
@@ -458,25 +457,21 @@ and
 from
 .Pa libman.h
 as opaque types for function prototypes.
-.It Qq Pa manpath.h
+.It Qq Pa manconf.h
 Requires
 .In sys/types.h
 for
 .Vt size_t .
 .Pp
 Provides
-.Vt struct manpaths
+.Vt struct manconf ,
+.Vt struct manpaths ,
+.Vt struct manoutput ,
 and the functions
-.Fn manpath_manconf ,
-.Fn manpath_parse ,
+.Fn manconf_parse ,
+.Fn manconf_output ,
 and
-.Fn manpath_free .
-.Pp
-When this header is included, the same file should not include
-.Pa out.h ,
-.Pa term.h ,
-or
-.Pa html.h .
+.Fn manconf_free .
 .It Qq Pa mansearch.h
 Requires
 .In sys/types.h
@@ -500,7 +495,7 @@ and
 Uses
 .Vt struct manpaths
 from
-.Pa manpath.h
+.Pa manconf.h
 as an opaque type for function prototypes.
 .Pp
 When this header is included, the same file should not include