diff --git a/distrib/notes/Makefile.inc b/distrib/notes/Makefile.inc index 907b7a4adff0..ae626613f481 100644 --- a/distrib/notes/Makefile.inc +++ b/distrib/notes/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.43.18.6 2020/01/08 07:53:30 msaitoh Exp $ +# $NetBSD: Makefile.inc,v 1.43.18.7 2020/01/26 11:19:36 martin Exp $ # # Ross Harvey @@ -118,7 +118,7 @@ ${TARG}.ASCII.toc: ${SRCS} mv -f $@.tmp $@ ${TARG}.HTML.toc: ${SRCS} - ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} > /dev/null + ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc2html ${MAIN} > /dev/null mv -f $@.tmp $@ ${TARG}.more.toc: ${SRCS} diff --git a/distrib/notes/common/main b/distrib/notes/common/main index ff1e4328cccb..6e62e6b59a41 100644 --- a/distrib/notes/common/main +++ b/distrib/notes/common/main @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.551.2.7 2019/12/02 15:08:52 martin Exp $ +.\" $NetBSD: main,v 1.551.2.8 2020/01/26 11:19:36 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -72,9 +72,11 @@ .as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k zaurus . .so \*[.CURDIR]/../common/macros . +.\" Override for HTML output +.if rHTML .ds title-section Installation procedure for NetBSD/\*M \*V .Dd \*[cur_date] .Dt INSTALL 8 -.Os NetBSD +.Os NetBSD/\*M \*V .Sh NAME .Nm INSTALL .Nd Installation procedure for diff --git a/share/tmac/doc2html b/share/tmac/doc2html index cbf120161a58..c3d4b1d3c401 100644 --- a/share/tmac/doc2html +++ b/share/tmac/doc2html @@ -1,4 +1,4 @@ -.\" $NetBSD: doc2html,v 1.67.16.2 2019/12/09 12:46:32 martin Exp $ +.\" $NetBSD: doc2html,v 1.67.16.3 2020/01/26 11:19:36 martin Exp $ .\" .\" Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -275,8 +275,8 @@ TODO: <head> <meta charset="\\*[html-charset]"/> <title> - \\*[document-title]\\$* - \\*[title-section] +.ie '\\*[title-section]'' \\*[document-title]\\$* +.el \\*[title-section]