Module Name: src
Committed By: martin
Date: Wed Nov 27 09:29:26 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
src/distrib/notes/common: macros main netboot postinstall sysinst
src/distrib/notes/sparc: prep
src/distrib/notes/sparc64: prep
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.43 -r1.44 src/distrib/notes/common/macros
cvs rdiff -u -r1.556 -r1.557 src/distrib/notes/common/main
cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/common/netboot
cvs rdiff -u -r1.85 -r1.86 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.109 -r1.110 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.28 -r1.29 src/distrib/notes/sparc/prep
cvs rdiff -u -r1.15 -r1.16 src/distrib/notes/sparc64/prep
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.45 src/distrib/notes/Makefile.inc:1.46
--- src/distrib/notes/Makefile.inc:1.45 Sun Nov 24 11:15:31 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 09:29:25 2019
@@ -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 <[email protected]>
@@ -51,8 +51,12 @@ PRESET+= -rnextminor=${nextmin}
.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 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# 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} > [email protected]
@@ -121,8 +124,6 @@ ${TARG}.ASCII.toc: ${SRCS}
${TARG}.HTML.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > [email protected]
mv -f [email protected] $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > [email protected]
- mv -f [email protected] $@
${TARG}.more.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > [email protected]
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.43 src/distrib/notes/common/macros:1.44
--- src/distrib/notes/common/macros:1.43 Wed Jan 24 09:04:41 2018
+++ src/distrib/notes/common/macros Wed Nov 27 09:29:25 2019
@@ -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
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.556 src/distrib/notes/common/main:1.557
--- src/distrib/notes/common/main:1.556 Mon Nov 25 15:40:18 2019
+++ src/distrib/notes/common/main Wed Nov 27 09:29:25 2019
@@ -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 @@ on an FTP site near you, usually located
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 @@ replacing
.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 @@ kernel, which contains all the tools req
.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 @@ system architectures, with preliminary s
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 @@ would not exist.
.
.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 @@ went into the
\*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 @@ Foundation, its composition, aims, and w
.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 @@ Changes between the initial \n[major].0
. 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].
Index: src/distrib/notes/common/netboot
diff -u src/distrib/notes/common/netboot:1.37 src/distrib/notes/common/netboot:1.38
--- src/distrib/notes/common/netboot:1.37 Thu Nov 21 19:23:17 2019
+++ src/distrib/notes/common/netboot Wed Nov 27 09:29:25 2019
@@ -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 @@ Additionally, you may wish to look at th
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 @@ YAMAMORI Takenori's
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 @@ need to extract and set up the client's
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
Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.85 src/distrib/notes/common/postinstall:1.86
--- src/distrib/notes/common/postinstall:1.85 Sun Nov 24 11:15:33 2019
+++ src/distrib/notes/common/postinstall Wed Nov 27 09:29:25 2019
@@ -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 @@ if you want to edit the password databas
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]
Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.109 src/distrib/notes/common/sysinst:1.110
--- src/distrib/notes/common/sysinst:1.109 Sun Nov 24 11:15:33 2019
+++ src/distrib/notes/common/sysinst Wed Nov 27 09:29:25 2019
@@ -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 @@ and SE/30), it is necessary to install C
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 @@ If
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
Index: src/distrib/notes/sparc/prep
diff -u src/distrib/notes/sparc/prep:1.28 src/distrib/notes/sparc/prep:1.29
--- src/distrib/notes/sparc/prep:1.28 Sun Nov 24 23:26:43 2019
+++ src/distrib/notes/sparc/prep Wed Nov 27 09:29:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.28 2019/11/24 23:26:43 uwe Exp $
+.\" $NetBSD: prep,v 1.29 2019/11/27 09:29:25 martin Exp $
.
.Ss2 Configuring your PROM
.
@@ -32,8 +32,8 @@ varies from terminal to terminal).
If the ethernet address of your \*M system is
.Li ff:ff:ff:ff:ff:ff ,
then your NVRAM battery is dead and you will have trouble using
-ethernet (among other problems). Read the Sun NVRAM/Hostid FAQ.
-.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html
+ethernet (among other problems). Read the
+.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" .
.Pp
If you have a valid ethernet address and you plan to netboot, write down
your system's ethernet address.
Index: src/distrib/notes/sparc64/prep
diff -u src/distrib/notes/sparc64/prep:1.15 src/distrib/notes/sparc64/prep:1.16
--- src/distrib/notes/sparc64/prep:1.15 Thu Apr 23 01:56:50 2009
+++ src/distrib/notes/sparc64/prep Wed Nov 27 09:29:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.15 2009/04/23 01:56:50 snj Exp $
+.\" $NetBSD: prep,v 1.16 2019/11/27 09:29:25 martin Exp $
.
.Ss2 Deciding on partition sizes
.
@@ -73,8 +73,8 @@ If the ethernet address of your \*M syst
.Dq banner
command),
then your NVRAM battery is dead and you will have trouble using
-ethernet (among other problems). Read the Sun NVRAM/Hostid FAQ.
-.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html
+ethernet (among other problems). Read the
+.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" .
.Pp
If you have a valid ethernet address and you plan to netboot, write down
your system's ethernet address.
