Module Name: src
Committed By: martin
Date: Sun Jan 26 11:19:36 UTC 2020
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
src/distrib/notes/common [netbsd-9]: main
src/share/tmac [netbsd-9]: doc2html
Log Message:
Pull up following revision(s) (requested by uwe in ticket #652):
distrib/notes/Makefile.inc: revision 1.54
distrib/notes/common/main: revision 1.561
distrib/notes/common/main: revision 1.562
share/tmac/doc2html: revision 1.71
Use .Os NetBSD/\*M \*V to get more informative footer.
Provide ability to override <title>
If \*[title-section] is non-empty, use it to override the title
instead of appending it. Nothing in the tree uses title-section
currently, so it shouldn't affect any existing document.
This override will be used by the installation notes where the default
title is less than helpful.
Override HTML <title> to something more informative.
Requested by martin@
Use -mdoc2html to generate HTML TOC to avoids warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.6 -r1.43.18.7 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.551.2.7 -r1.551.2.8 src/distrib/notes/common/main
cvs rdiff -u -r1.67.16.2 -r1.67.16.3 src/share/tmac/doc2html
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.6 src/distrib/notes/Makefile.inc:1.43.18.7
--- src/distrib/notes/Makefile.inc:1.43.18.6 Wed Jan 8 07:53:30 2020
+++ src/distrib/notes/Makefile.inc Sun Jan 26 11:19:36 2020
@@ -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 <r...@netbsd.org>
@@ -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}
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.551.2.7 src/distrib/notes/common/main:1.551.2.8
--- src/distrib/notes/common/main:1.551.2.7 Mon Dec 2 15:08:52 2019
+++ src/distrib/notes/common/main Sun Jan 26 11:19:36 2020
@@ -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 <title> 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
Index: src/share/tmac/doc2html
diff -u src/share/tmac/doc2html:1.67.16.2 src/share/tmac/doc2html:1.67.16.3
--- src/share/tmac/doc2html:1.67.16.2 Mon Dec 9 12:46:32 2019
+++ src/share/tmac/doc2html Sun Jan 26 11:19:36 2020
@@ -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]
</title>
<style type="text/css">
<!--
