[src/trunk]: src/distrib/notes More cleanup:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/distrib/notes More cleanup:
From: martin <martin%NetBSD.org@localhost>
Date: Mon, 02 Dec 2019 00:54:17 +0000
details:   https://anonhg.NetBSD.org/src/rev/1455a4531df8
branches:  trunk
changeset: 465531:1455a4531df8
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 27 09:29:25 2019 +0000

description:
More cleanup:
 - simplify TOC handling and remove arg limit (from uwe)
 - use Lk with explicit anchor text in some places
 - do not allow official release builds when we can not derive the
   proper date from the buildid

diffstat:

 distrib/notes/Makefile.inc       |  11 ++++---
 distrib/notes/common/macros      |  10 +++---
 distrib/notes/common/main        |  55 ++++++++++++++++-----------------------
 distrib/notes/common/netboot     |  11 +++----
 distrib/notes/common/postinstall |  10 ++----
 distrib/notes/common/sysinst     |   9 ++---
 distrib/notes/sparc/prep         |   6 ++--
 distrib/notes/sparc64/prep       |   6 ++--
 8 files changed, 53 insertions(+), 65 deletions(-)

diffs (truncated from 337 to 300 lines):

diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/Makefile.inc
--- a/distrib/notes/Makefile.inc        Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/Makefile.inc        Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.45 2019/11/24 11:15:31 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.46 2019/11/27 09:29:25 martin Exp $
 #
 
 # Ross Harvey <ross%NetBSD.org@localhost>
@@ -51,8 +51,12 @@
 .if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
 curdate!=      env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
 .else
+.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
+.error "No release date could be derived from BUILDID"
+.else
 curdate!=      env LANG="C" date "+%b %d, %Y"
 .endif
+.endif
 PRESET+=       -dcur_date="${curdate}"
 
 POST_PLAIN= -P-b -P-u -P-o
@@ -103,8 +107,7 @@
 # space taken by the TOC itself.
 #
 
-TOCPROC=          2>&1 >/dev/null |\
-           ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC=          2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
 
 ${TARG}.PostScript.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
@@ -121,8 +124,6 @@
 ${TARG}.HTML.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
        mv -f $@.tmp $@
-       ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
-       mv -f $@.tmp $@
 
 ${TARG}.more.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/common/macros
--- a/distrib/notes/common/macros       Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/common/macros       Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
+.\"    $NetBSD: macros,v 1.44 2019/11/27 09:29:25 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -312,13 +312,13 @@
 .if dTOC \{
 .rn Ss Ss-toc
 .de Ss
-.Ss-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 0 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss-toc \\$@
+.tm .Ti 0 \\n% "\\$*"
 ..
 .rn Ss2 Ss2-toc
 .de Ss2
-.Ss2-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 1 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss2-toc \\$@
+.tm .Ti 1 \\n% "\\$*"
 ..
 .\}
 .de Te
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/common/main
--- a/distrib/notes/common/main Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/common/main Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: main,v 1.556 2019/11/25 15:40:18 pgoyette Exp $
+.\"    $NetBSD: main,v 1.557 2019/11/27 09:29:25 martin Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -145,8 +145,7 @@
 directory.
 Check the list of
 .Nx
-mirrors at
-.Lk https://www.NetBSD.org/mirrors
+.Lk https://www.NetBSD.org/mirrors mirrors
 for details.
 .Pp
 Option 2: bootable CD-ROM images from
@@ -275,12 +274,10 @@
 .Pa /dev/rsd0d
 with the appropriate device for your system:
 .Dl # Ic "dd if=NetBSD-\*V-\*M-install.img of=/dev/rsd0d bs=32k"
-On Windows, you will need to use a program such as Win32 Disk Imager,
-which can be found at
-.Lk http://sourceforge.net/projects/win32diskimager/
+On Windows, you will need to use a program such as
+.Lk http://sourceforge.net/projects/win32diskimager/ "Win32 Disk Imager" ,
 or
-Rawrite32 which can be found at
-.Lk https://www.NetBSD.org/~martin/rawrite32 .
+.Lk https://www.NetBSD.org/~martin/rawrite32 Rawrite32 .
 .if \n[amd64]:\n[i386] \{\
 If you have problems writing a raw image to a floppy,
 the
@@ -330,8 +327,7 @@
 .It
 Determine your machine's model, quirks, and Open Firmware version from the
 .Nx*M
-Model Support webpage.
-.Lk https://www.NetBSD.org/ports/macppc/models.html
+.Lk https://www.NetBSD.org/ports/macppc/models.html "Model Support webpage" .
 .Pp
 At present,
 .Nx*M
@@ -495,9 +491,8 @@
 source form.
 Please see the
 .Nx
-website at
-.Lk https://www.NetBSD.org/
-for information on them.)
+.Lk https://www.NetBSD.org/ website
+for information on them.
 .Pp
 .Nx
 is a completely integrated system.
@@ -519,8 +514,8 @@
 .
 .ie \n[RELEASE_BRANCH] .Ss Changes Between The NetBSD \n[oldvers] \
 and \n[major] Releases
-.el .Ss "Changes Between The NetBSD \n[oldvers] and" \
-\n[major] Releases, and newer.
+.el .Ss Changes Between The NetBSD \n[oldvers] and \
+\n[major] Releases, and newer
 .Pp
 The
 .Nx
@@ -537,35 +532,31 @@
 \*V release.
 .ie \n[RELEASE_BRANCH] \{\
 The complete list of changes can be found in the following files:
-.(tag
-.It Li CHANGES
-.Lk \*[RELEASE_URL]/CHANGES
+.br
+.Lk "\*[RELEASE_URL]/CHANGES" CHANGES
 .de showdotchanges
 .  nr ominor (\\$1-1)
 .  if \\n[ominor] .showdotchanges \\n[ominor]
 .  nr ominor (\\$1-1)
-.  It Li CHANGES-\\n[major].\\$1
-.  Lk \*[RELEASE_URL]/CHANGES-\n[major].\\$1
+.  br
+.  Lk "\*[RELEASE_URL]/CHANGES-\n[major].\\$1" "CHANGES-\\n[major].\\$1"
 ..
 .showdotchanges \n[minor]
 .if (\n[nextminor] > \n[minor]) \{\
-.  It Li CHANGES-\\n[major].\n[nextminor]
-.  Lk \*[RELEASE_URL]/CHANGES-\n[major].\n[nextminor]
+.  br
+.  Lk "\*[RELEASE_URL]/CHANGES-\n[major].\n[nextminor]" "CHANGES-\\n[major].\n[nextminor]"
 .\}
-.tag)
+.br
 files in the top level directory of the NetBSD \n[major].\n[minor] release tree.
 .Pp
-.\" fill in with changes.mdoc
 .
 .\} \" \n[RELEASE_BRANCH]
 .el \{\
 The complete list of changes can be found in the following files:
-.(tag
-.It Li CHANGES
-.Lk \*[RELEASE_URL]/CHANGES
-.It Li CHANGES.prev
-.Lk \*[RELEASE_URL]/CHANGES.prev
-.tag)
+.br
+.Lk \*[RELEASE_URL]/CHANGES CHANGES
+.br
+.Lk \*[RELEASE_URL]/CHANGES.prev CHANGES.prev
 .\} \" !\n[RELEASE_BRANCH]
 .
 .Ss "Features to be removed in a later release"
@@ -605,7 +596,7 @@
 .Pp
 .
 Refer to
-.Lk https://www.NetBSD.org/mirrors/
+.Lk https://www.NetBSD.org/mirrors/ mirrors
 .br_ne 10P
 .
 .Ss "NetBSD \*V Release Contents
@@ -631,7 +622,7 @@
 .  It Li CHANGES-\\n[major].\\$1
 Changes between the \n[major].\\n[ominor] and the \n[major].\\$1 release.
 ..
-.showdotchanges \n[minor]
+.if \n[minor] .showdotchanges \n[minor]
 .if (\n[nextminor] > \n[minor]) \{\
 .It Li CHANGES-\\n[major].\n[nextminor]
 Changes after the release of \n[major].\n[minor].
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/common/netboot
--- a/distrib/notes/common/netboot      Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/common/netboot      Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: netboot,v 1.37 2019/11/21 19:23:17 martin Exp $
+.\"    $NetBSD: netboot,v 1.38 2019/11/27 09:29:25 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -40,7 +40,7 @@
 manual page and the manual pages for each daemon you'll be configuring.
 If the server(s) are another operating system, you should consult the
 NetBSD Diskless HOW-TO, which will walk you through the steps necessary to
-configure the netboot services on a variety of platforms.
+configure the netboot services on a variety of platforms:
 .Lk https://www.NetBSD.org/docs/network/netboot/
 .if !\n[hppa]:\n[next68k] \{\
 .Pp
@@ -236,8 +236,8 @@
 package instead of native
 .Xr rbootd 8 .
 Please refer the "Setting up the rbootd server" section
-in the NetBSD Diskless HOW-TO
-.Lk https://www.NetBSD.org/docs/network/netboot/rbootd/
+in the
+.Lk https://www.NetBSD.org/docs/network/netboot/rbootd/ "NetBSD Diskless HOW-TO"
 for details.
 .Pp
 .It
@@ -769,8 +769,7 @@
 The Diskless HOW-TO describes how to provide better security and save
 space on the NFS server over the procedure listed here.
 See
-.Lk https://www.NetBSD.org/docs/network/netboot/nfs.html
-for details.
+.Lk https://www.NetBSD.org/docs/network/netboot/nfs.html "for details" .
 .(bullet -compact
 Extracting distribution sets
 .Pp
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/common/postinstall
--- a/distrib/notes/common/postinstall  Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/common/postinstall  Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: postinstall,v 1.85 2019/11/24 11:15:33 martin Exp $
+.\"    $NetBSD: postinstall,v 1.86 2019/11/27 09:29:25 martin Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -288,14 +288,12 @@
 The X Window System
 .Pp
 If you installed the X Window System, you may want to read the
-chapter about X in the NetBSD Guide:
-.Lk https://www.NetBSD.org/docs/guide/en/chap-x.html
+chapter about X in the
+.Lk https://www.NetBSD.org/docs/guide/en/chap-x.html "NetBSD Guide" :
 .if \n[hp300] \{\
 Also, you may want to read through the
 .Nx*M
-FAQ entry on X11.
-.br
-.Lk https://www.NetBSD.org/ports/hp300/faq.html#x11
+.Lk https://www.NetBSD.org/ports/hp300/faq.html#x11 "FAQ entry on X11" .
 .\}
 .if \n[mac68k] \{\
 .(tag [Color_X]
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/common/sysinst
--- a/distrib/notes/common/sysinst      Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/common/sysinst      Wed Nov 27 09:29:25 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: sysinst,v 1.109 2019/11/24 11:15:33 martin Exp $
+.\"    $NetBSD: sysinst,v 1.110 2019/11/27 09:29:25 martin Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -599,8 +599,7 @@
 ROM issues which prevent you from enabling 32-bit addressing.
 Please see the
 .Nx*M
-FAQ at
-.Lk https://www.NetBSD.org/ports/mac68k/faq/
+.Lk https://www.NetBSD.org/ports/mac68k/faq/ FAQ
 for more information.
 .tag)
 .Pp
@@ -999,8 +998,8 @@
 reports
 .Dl "I can not find any hard disk for use by NetBSD"
 or the drive you wish to install onto is missing, then you should look at
-the FAQ entry
-.Lk https://www.NetBSD.org/ports/macppc/faq.html#nodisk
+the
+.Lk "https://www.NetBSD.org/ports/macppc/faq.html#nodisk"; "FAQ entry" .
 .\}
 .\}
 .It
diff -r 0b0f082f447a -r 1455a4531df8 distrib/notes/sparc/prep
--- a/distrib/notes/sparc/prep  Wed Nov 27 09:16:58 2019 +0000
+++ b/distrib/notes/sparc/prep  Wed Nov 27 09:29:25 2019 +0000
Prev by Date: [src/trunk]: src/sys/arch/amd64 Add support for PT_[GS]ETXMMREGS requests for...
Next by Date: [src/trunk]: src/sys - Simplify sc->mii_anegticks setting. Same as FreeBSD.
Previous by Thread: [src/trunk]: src/sys/arch/amd64 Add support for PT_[GS]ETXMMREGS requests for...
Next by Thread: [src/trunk]: src/sys - Simplify sc->mii_anegticks setting. Same as FreeBSD.
Indexes:
Home | Main Index | Thread Index | Old Index