summaryrefslogtreecommitdiff
path: root/share/doc
diff options
context:
space:
mode:
Diffstat (limited to 'share/doc')
-rw-r--r--share/doc/ps1/00.contents/00.contents (renamed from share/doc/ps1/00.contents)0
-rw-r--r--share/doc/ps1/00.contents/Makefile10
-rw-r--r--share/doc/ps1/06.sysman/Makefile2
-rw-r--r--share/doc/ps1/06.sysman/a.t12
-rw-r--r--share/doc/ps1/08.ipc/1.t6
-rw-r--r--share/doc/ps1/08.ipc/2.t7
-rw-r--r--share/doc/ps1/08.ipc/3.t7
-rw-r--r--share/doc/ps1/08.ipc/4.t7
-rw-r--r--share/doc/ps1/08.ipc/5.t7
-rw-r--r--share/doc/ps1/08.ipc/Makefile2
-rw-r--r--share/doc/ps1/13.rcs/Makefile2
-rw-r--r--share/doc/ps1/14.sccs/Makefile2
-rw-r--r--share/doc/ps1/18.curses/Makefile12
-rw-r--r--share/doc/ps1/Makefile6
-rw-r--r--share/doc/ps1/Title/Makefile9
-rw-r--r--share/doc/ps1/Title/Title (renamed from share/doc/ps1/Title)0
-rw-r--r--share/doc/smm/00.contents/00.contents (renamed from share/doc/smm/00.contents)0
-rw-r--r--share/doc/smm/00.contents/Makefile10
-rw-r--r--share/doc/smm/01.setup/common/3.t7
-rw-r--r--share/doc/smm/01.setup/common/4.t7
-rw-r--r--share/doc/smm/01.setup/common/5.t7
-rw-r--r--share/doc/smm/01.setup/common/6.t5
-rw-r--r--share/doc/smm/01.setup/tahoe/0.t1
-rw-r--r--share/doc/smm/01.setup/tahoe/1.t5
-rw-r--r--share/doc/smm/01.setup/tahoe/2.t7
-rw-r--r--share/doc/smm/01.setup/tahoe/Makefile2
-rw-r--r--share/doc/smm/01.setup/tahoe/a.t4
-rw-r--r--share/doc/smm/01.setup/tahoe/b.t4
-rw-r--r--share/doc/smm/01.setup/vax/0.t1
-rw-r--r--share/doc/smm/01.setup/vax/1.t5
-rw-r--r--share/doc/smm/01.setup/vax/2.t7
-rw-r--r--share/doc/smm/01.setup/vax/Makefile2
-rw-r--r--share/doc/smm/01.setup/vax/a.t4
-rw-r--r--share/doc/smm/01.setup/vax/b.t4
-rw-r--r--share/doc/smm/01.setup/vax/c.t4
-rw-r--r--share/doc/smm/01.setup/vax/vaxhints.t3
-rw-r--r--share/doc/smm/02.config/0.t7
-rw-r--r--share/doc/smm/02.config/Makefile2
-rw-r--r--share/doc/smm/04.quotas/Makefile2
-rw-r--r--share/doc/smm/05.fsck/Makefile2
-rw-r--r--share/doc/smm/06.lpd/Makefile2
-rw-r--r--share/doc/smm/07.sendmailop/Makefile2
-rw-r--r--share/doc/smm/08.timedop/Makefile2
-rw-r--r--share/doc/smm/10.newsop/Makefile2
-rw-r--r--share/doc/smm/10.newsop/tmac.n1
-rw-r--r--share/doc/smm/11.named/Makefile2
-rw-r--r--share/doc/smm/11.named/named.local8
-rw-r--r--share/doc/smm/14.fastfs/Makefile2
-rw-r--r--share/doc/smm/15.net/Makefile2
-rw-r--r--share/doc/smm/16.sendmail/Makefile2
-rw-r--r--share/doc/smm/20.termdesc/Makefile2
-rw-r--r--share/doc/smm/22.timed/Makefile2
-rw-r--r--share/doc/smm/22.timed/timed.ms88
-rw-r--r--share/doc/smm/Makefile12
-rw-r--r--share/doc/smm/Title/Makefile9
-rw-r--r--share/doc/smm/Title/Title (renamed from share/doc/smm/Title)114
-rw-r--r--share/doc/usd/00.contents/00.contents (renamed from share/doc/usd/00.contents)0
-rw-r--r--share/doc/usd/00.contents/Makefile10
-rw-r--r--share/doc/usd/04.csh/Makefile2
-rw-r--r--share/doc/usd/07.Mail/Makefile2
-rw-r--r--share/doc/usd/09.newsread/Makefile2
-rw-r--r--share/doc/usd/10.etiq/Makefile2
-rw-r--r--share/doc/usd/11.notes/Makefile2
-rw-r--r--share/doc/usd/14.edit/Makefile2
-rw-r--r--share/doc/usd/14.edit/edittut.ms6
-rw-r--r--share/doc/usd/15.vi/Makefile2
-rw-r--r--share/doc/usd/15.vi/vi.apwh.ms46
-rw-r--r--share/doc/usd/15.vi/vi.summary1
-rw-r--r--share/doc/usd/16.ex/Makefile2
-rw-r--r--share/doc/usd/16.ex/ex.rm1
-rw-r--r--share/doc/usd/16.ex/ex.summary11
-rw-r--r--share/doc/usd/21.msdiffs/Makefile2
-rw-r--r--share/doc/usd/22.memacros/Makefile2
-rw-r--r--share/doc/usd/23.meref/Makefile2
-rw-r--r--share/doc/usd/33.rogue/Makefile2
-rw-r--r--share/doc/usd/34.trek/Makefile2
-rw-r--r--share/doc/usd/Makefile6
-rw-r--r--share/doc/usd/Title/Makefile9
-rw-r--r--share/doc/usd/Title/Title (renamed from share/doc/usd/Title)0
79 files changed, 314 insertions, 247 deletions
diff --git a/share/doc/ps1/00.contents b/share/doc/ps1/00.contents/00.contents
index 18062ea853145..18062ea853145 100644
--- a/share/doc/ps1/00.contents
+++ b/share/doc/ps1/00.contents/00.contents
diff --git a/share/doc/ps1/00.contents/Makefile b/share/doc/ps1/00.contents/Makefile
new file mode 100644
index 0000000000000..3a7f865add0bc
--- /dev/null
+++ b/share/doc/ps1/00.contents/Makefile
@@ -0,0 +1,10 @@
+VOLUME= ps1
+DOC= 00.contents
+
+SRCS= 00.contents
+MACROS= -ms
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/ps1/06.sysman/Makefile b/share/doc/ps1/06.sysman/Makefile
index f177ab9d9844e..84d0c9f287835 100644
--- a/share/doc/ps1/06.sysman/Makefile
+++ b/share/doc/ps1/06.sysman/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:33:55 mycroft Exp
-DIR= ps1/06.sysman
+VOLUME= ps1
DOC= 06.sysman
SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
diff --git a/share/doc/ps1/06.sysman/a.t b/share/doc/ps1/06.sysman/a.t
index 4b1223176e7d1..5529d08fd0f33 100644
--- a/share/doc/ps1/06.sysman/a.t
+++ b/share/doc/ps1/06.sysman/a.t
@@ -230,13 +230,13 @@ setsockopt set socket option
.in -5
.h 2.4 "Terminals, block and character devices
.in +5
-.TS
-lw(1.6i) aw(3i).
-.TE
+.\".TS
+.\"lw(1.6i) aw(3i).
+.\".TE
.in -5
.h 2.5 "Processes and kernel hooks
.in +5
-.TS
-lw(1.6i) aw(3i).
-.TE
+.\".TS
+.\"lw(1.6i) aw(3i).
+.\".TE
.in -5
diff --git a/share/doc/ps1/08.ipc/1.t b/share/doc/ps1/08.ipc/1.t
index 28379363a4b87..e500a6df76b2d 100644
--- a/share/doc/ps1/08.ipc/1.t
+++ b/share/doc/ps1/08.ipc/1.t
@@ -36,16 +36,18 @@
.\".ds RF "Leffler/Fabry/Joy
.\".ds LF "\*(DY
.\".ds CF "
-.nr H1 1
+.\".nr H1 1
.LP
.bp
.LG
.B
.ce
-1. INTRODUCTION
+.NH 1
+INTRODUCTION
.sp 2
.R
.NL
+.PP
One of the most important additions to UNIX in 4.2BSD was interprocess
communication.
These facilities were the result of
diff --git a/share/doc/ps1/08.ipc/2.t b/share/doc/ps1/08.ipc/2.t
index bfa3ab6fb9e7e..3c918e850cee9 100644
--- a/share/doc/ps1/08.ipc/2.t
+++ b/share/doc/ps1/08.ipc/2.t
@@ -33,13 +33,14 @@
.\"
.\".ds RH "Basics
.bp
-.nr H1 2
-.nr H2 0
+.\".nr H1 2
+.\".nr H2 0
.bp
.LG
.B
.ce
-2. BASICS
+.NH 1
+BASICS
.sp 2
.R
.NL
diff --git a/share/doc/ps1/08.ipc/3.t b/share/doc/ps1/08.ipc/3.t
index 78966f1487a6a..c6978728b0138 100644
--- a/share/doc/ps1/08.ipc/3.t
+++ b/share/doc/ps1/08.ipc/3.t
@@ -33,13 +33,14 @@
.\"
.\".ds RH "Network Library Routines
.bp
-.nr H1 3
-.nr H2 0
+.\".nr H1 3
+.\".nr H2 0
.bp
.LG
.B
.ce
-3. NETWORK LIBRARY ROUTINES
+.NH 1
+NETWORK LIBRARY ROUTINES
.sp 2
.R
.NL
diff --git a/share/doc/ps1/08.ipc/4.t b/share/doc/ps1/08.ipc/4.t
index 7ce9b044a31e7..9fc7a774ce49e 100644
--- a/share/doc/ps1/08.ipc/4.t
+++ b/share/doc/ps1/08.ipc/4.t
@@ -33,14 +33,15 @@
.\"
.\".ds RH "Client/Server Model
.bp
-.nr H1 4
-.nr H2 0
+.\".nr H1 4
+.\".nr H2 0
.sp 8i
.bp
.LG
.B
.ce
-4. CLIENT/SERVER MODEL
+.NH 1
+CLIENT/SERVER MODEL
.sp 2
.R
.NL
diff --git a/share/doc/ps1/08.ipc/5.t b/share/doc/ps1/08.ipc/5.t
index 11b195d14111b..f106a3c00b05f 100644
--- a/share/doc/ps1/08.ipc/5.t
+++ b/share/doc/ps1/08.ipc/5.t
@@ -33,12 +33,13 @@
.\"
.\".ds RH "Advanced Topics
.bp
-.nr H1 5
-.nr H2 0
+.\".nr H1 5
+.\".nr H2 0
.LG
.B
.ce
-5. ADVANCED TOPICS
+.NH 1
+ADVANCED TOPICS
.sp 2
.R
.NL
diff --git a/share/doc/ps1/08.ipc/Makefile b/share/doc/ps1/08.ipc/Makefile
index 3bdacaefa0bf8..76075f8d5a075 100644
--- a/share/doc/ps1/08.ipc/Makefile
+++ b/share/doc/ps1/08.ipc/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 1.4 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:33:44 mycroft Exp
-DIR= ps1/08.ipc
+VOLUME= ps1
DOC= 08.ipc
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t
diff --git a/share/doc/ps1/13.rcs/Makefile b/share/doc/ps1/13.rcs/Makefile
index c8fddff126620..26fc005af9595 100644
--- a/share/doc/ps1/13.rcs/Makefile
+++ b/share/doc/ps1/13.rcs/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:33:38 mycroft Exp
-DIR= ps1/13.rcs
+VOLUME= ps1
DOC= 13.rcs
MSRC= rcs.man
diff --git a/share/doc/ps1/14.sccs/Makefile b/share/doc/ps1/14.sccs/Makefile
index d41fca6b7683c..051b308b6e8bb 100644
--- a/share/doc/ps1/14.sccs/Makefile
+++ b/share/doc/ps1/14.sccs/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:33:32 mycroft Exp
-DIR= ps1/14.sccs
+VOLUME= ps1
DOC= 14.sccs
SRCS= sccs.me
diff --git a/share/doc/ps1/18.curses/Makefile b/share/doc/ps1/18.curses/Makefile
index 4bcd1a52b5f7f..8c7ddb4597169 100644
--- a/share/doc/ps1/18.curses/Makefile
+++ b/share/doc/ps1/18.curses/Makefile
@@ -1,13 +1,15 @@
# from: @(#)Makefile 6.4 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:33:26 mycroft Exp
-DIR= ps1/18.curses
+VOLUME= ps1
DOC= 18.curses
SRCS= Master
MACROS= -me
-CLEANFILES+=win_st.gr twinkle1.gr twinkle2.gr life.gr intro.2.tbl appen.A.tbl
+CLEANFILES+=${.CURDIR}/win_st.gr ${.CURDIR}/twinkle1.gr \
+ ${.CURDIR}/twinkle2.gr ${.CURDIR}/life.gr \
+ ${.CURDIR}/intro.2.tbl ${.CURDIR}/appen.A.tbl
.include <bsd.doc.mk>
@@ -27,7 +29,7 @@ ${DOC}.${PRINTER}: ${SRCS} win_st.gr twinkle1.gr twinkle2.gr life.gr \
# Don't re-run vgrind unless you want to patch the output files.
VFONT= /usr/libexec/vfontedpr
.c.gr:
- ( cd ${.CURDIR} ; ${VFONT} $*.c ) | grep -v "^'wh" > $*.gr
+ cd ${.CURDIR} ; ${VFONT} $*.c | grep -v "^'wh" > $*.gr
.VPATH: ${CURDIR}/obj
@@ -36,7 +38,7 @@ appen.B: win_st.gr
appen.C: twinkle1.gr life.gr twinkle2.gr
intro.2.tbl: intro.2
- ( cd ${.CURDIR} ; ${TBL} intro.2 ) > intro.2.tbl
+ cd ${.CURDIR} ; ${TBL} intro.2 > intro.2.tbl
appen.A.tbl: appen.A
- ( cd ${.CURDIR} ; ${TBL} appen.A ) > appen.A.tbl
+ cd ${.CURDIR} ; ${TBL} appen.A > appen.A.tbl
diff --git a/share/doc/ps1/Makefile b/share/doc/ps1/Makefile
index a2513947823bc..b521d4994f680 100644
--- a/share/doc/ps1/Makefile
+++ b/share/doc/ps1/Makefile
@@ -7,8 +7,8 @@
# Broken: 04.pascal 07.ipctut
BINDIR= /usr/share/doc/ps1
-FILES= 00.contents Makefile Title
-SUBDIR= 06.sysman \
+SUBDIR= Title 00.contents \
+ 06.sysman \
08.ipc 13.rcs 14.sccs \
18.curses
@@ -21,7 +21,5 @@ beforeinstall:
else \
true ; \
fi
- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
- ${DESTDIR}${BINDIR}
.include <bsd.subdir.mk>
diff --git a/share/doc/ps1/Title/Makefile b/share/doc/ps1/Title/Makefile
new file mode 100644
index 0000000000000..34fdca3b9f9cd
--- /dev/null
+++ b/share/doc/ps1/Title/Makefile
@@ -0,0 +1,9 @@
+VOLUME= ps1
+DOC= Title
+
+SRCS= Title
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/ps1/Title b/share/doc/ps1/Title/Title
index 599737b762644..599737b762644 100644
--- a/share/doc/ps1/Title
+++ b/share/doc/ps1/Title/Title
diff --git a/share/doc/smm/00.contents b/share/doc/smm/00.contents/00.contents
index 908c4ff6da3bd..908c4ff6da3bd 100644
--- a/share/doc/smm/00.contents
+++ b/share/doc/smm/00.contents/00.contents
diff --git a/share/doc/smm/00.contents/Makefile b/share/doc/smm/00.contents/Makefile
new file mode 100644
index 0000000000000..e191b184eba0c
--- /dev/null
+++ b/share/doc/smm/00.contents/Makefile
@@ -0,0 +1,10 @@
+VOLUME= smm
+DOC= 00.contents
+
+SRCS= 00.contents
+MACROS= -ms
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/smm/01.setup/common/3.t b/share/doc/smm/01.setup/common/3.t
index 395cca0813c0d..1ac6a4377783f 100644
--- a/share/doc/smm/01.setup/common/3.t
+++ b/share/doc/smm/01.setup/common/3.t
@@ -36,13 +36,14 @@
.ds RH "Upgrading a 4.2BSD or \*(Ps System
.ds CF \*(DY
.LP
-.nr H1 3
-.nr H2 0
+.\".nr H1 3
+.\".nr H2 0
.bp
.LG
.B
.ce
-3. UPGRADING A 4.2BSD OR \*(Ps SYSTEM
+.NH 1
+UPGRADING A 4.2BSD OR \*(Ps SYSTEM
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/common/4.t b/share/doc/smm/01.setup/common/4.t
index 334a882d2d156..74bd2153280b4 100644
--- a/share/doc/smm/01.setup/common/4.t
+++ b/share/doc/smm/01.setup/common/4.t
@@ -35,15 +35,16 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 4
-.nr H2 0
+.\".nr H1 4
+.\".nr H2 0
.ds CF \*(DY
.ds RH "System setup
.bp
.LG
.B
.ce
-4. SYSTEM SETUP
+.NH 1
+SYSTEM SETUP
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/common/5.t b/share/doc/smm/01.setup/common/5.t
index 614a08e800954..21c886f184fcb 100644
--- a/share/doc/smm/01.setup/common/5.t
+++ b/share/doc/smm/01.setup/common/5.t
@@ -37,13 +37,14 @@
.ds RH Network setup
.ds CF \*(DY
.LP
-.nr H1 5
-.nr H2 0
+.\".nr H1 5
+.\".nr H2 0
.bp
.LG
.B
.ce
-5. NETWORK SETUP
+.NH 1
+NETWORK SETUP
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/common/6.t b/share/doc/smm/01.setup/common/6.t
index 3b8067219c330..134085a31dc9b 100644
--- a/share/doc/smm/01.setup/common/6.t
+++ b/share/doc/smm/01.setup/common/6.t
@@ -35,14 +35,15 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "System Operation
.ds CF \*(DY
.bp
.LG
.B
.ce
+.NH 1
6. SYSTEM OPERATION
.sp 2
.R
diff --git a/share/doc/smm/01.setup/tahoe/0.t b/share/doc/smm/01.setup/tahoe/0.t
index 7672a7aab07f4..9bc8d6838221c 100644
--- a/share/doc/smm/01.setup/tahoe/0.t
+++ b/share/doc/smm/01.setup/tahoe/0.t
@@ -32,6 +32,7 @@
.\" @(#)0.t 1.6 (Berkeley) 5/7/91
.\"
.nr Th 1 \" Tahoe version
+.nr Vx 0
.ds Th Tahoe
.ds Ux \s-1UNIX\s0
.ds Bs \s-1BSD\s0
diff --git a/share/doc/smm/01.setup/tahoe/1.t b/share/doc/smm/01.setup/tahoe/1.t
index 5db94647393e3..2c12cedbaad76 100644
--- a/share/doc/smm/01.setup/tahoe/1.t
+++ b/share/doc/smm/01.setup/tahoe/1.t
@@ -37,12 +37,13 @@
.ds RH Introduction
.ds CF \*(DY
.LP
-.nr H1 1
+.\".nr H1 1
.bp
.LG
.B
.ce
-1. INTRODUCTION
+.NH 1
+INTRODUCTION
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/tahoe/2.t b/share/doc/smm/01.setup/tahoe/2.t
index 38b699016aa7e..b6e708123f511 100644
--- a/share/doc/smm/01.setup/tahoe/2.t
+++ b/share/doc/smm/01.setup/tahoe/2.t
@@ -37,13 +37,14 @@
.ds RH Bootstrapping
.ds CF \*(DY
.bp
-.nr H1 2
-.nr H2 0
+.\".nr H1 2
+.\".nr H2 0
.bp
.LG
.B
.ce
-2. BOOTSTRAP PROCEDURE
+.NH 1
+BOOTSTRAP PROCEDURE
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/tahoe/Makefile b/share/doc/smm/01.setup/tahoe/Makefile
index 9ecdc69c32b0a..2ee3d5bcbe940 100644
--- a/share/doc/smm/01.setup/tahoe/Makefile
+++ b/share/doc/smm/01.setup/tahoe/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 1.3 (Berkeley) 5/7/91
# Makefile,v 1.2 1993/07/31 15:33:14 mycroft Exp
-DIR= smm/01.setup/tahoe
+VOLUME= smm
DOC= 01.setup
RSRC= ../common/renohints.t
diff --git a/share/doc/smm/01.setup/tahoe/a.t b/share/doc/smm/01.setup/tahoe/a.t
index a202c2ae60887..ce42f2dfe3c82 100644
--- a/share/doc/smm/01.setup/tahoe/a.t
+++ b/share/doc/smm/01.setup/tahoe/a.t
@@ -35,8 +35,8 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "Appendix A \- bootstrap details
.ds CF \*(DY
.bp
diff --git a/share/doc/smm/01.setup/tahoe/b.t b/share/doc/smm/01.setup/tahoe/b.t
index 11aa172af2d79..81263be2860a9 100644
--- a/share/doc/smm/01.setup/tahoe/b.t
+++ b/share/doc/smm/01.setup/tahoe/b.t
@@ -35,8 +35,8 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "Appendix B \- installation troubleshooting
.ds CF \*(DY
.bp
diff --git a/share/doc/smm/01.setup/vax/0.t b/share/doc/smm/01.setup/vax/0.t
index b2acbd48b46c5..9101bfc485621 100644
--- a/share/doc/smm/01.setup/vax/0.t
+++ b/share/doc/smm/01.setup/vax/0.t
@@ -32,6 +32,7 @@
.\" @(#)0.t 6.6 (Berkeley) 5/7/91
.\"
.nr Vx 1 \" VAX version
+.nr Th 0
.ds Vx \s-1VAX\s0
.ds Ux \s-1UNIX\s0
.ds Bs \s-1BSD\s0
diff --git a/share/doc/smm/01.setup/vax/1.t b/share/doc/smm/01.setup/vax/1.t
index 76c650e1059e5..10592651123d0 100644
--- a/share/doc/smm/01.setup/vax/1.t
+++ b/share/doc/smm/01.setup/vax/1.t
@@ -37,12 +37,13 @@
.ds RH Introduction
.ds CF \*(DY
.LP
-.nr H1 1
+.\".nr H1 1
.bp
.LG
.B
.ce
-1. INTRODUCTION
+.NH 1
+INTRODUCTION
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/vax/2.t b/share/doc/smm/01.setup/vax/2.t
index 3969b07f09535..df8fe204cd6c8 100644
--- a/share/doc/smm/01.setup/vax/2.t
+++ b/share/doc/smm/01.setup/vax/2.t
@@ -37,13 +37,14 @@
.ds RH Bootstrapping
.ds CF \*(DY
.bp
-.nr H1 2
-.nr H2 0
+.\".nr H1 2
+.\".nr H2 0
.bp
.LG
.B
.ce
-2. BOOTSTRAP PROCEDURE
+.NH 1
+BOOTSTRAP PROCEDURE
.sp 2
.R
.NL
diff --git a/share/doc/smm/01.setup/vax/Makefile b/share/doc/smm/01.setup/vax/Makefile
index 272dc56921ccb..5c82184847d9c 100644
--- a/share/doc/smm/01.setup/vax/Makefile
+++ b/share/doc/smm/01.setup/vax/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 5/7/91
# Makefile,v 1.2 1993/07/31 15:33:08 mycroft Exp
-DIR= smm/01.setup/vax
+VOLUME= smm
DOC= 01.setup
RSRC= ../common/renohints.t
diff --git a/share/doc/smm/01.setup/vax/a.t b/share/doc/smm/01.setup/vax/a.t
index b8c9b5c0f7adc..d2fe0a678c1b9 100644
--- a/share/doc/smm/01.setup/vax/a.t
+++ b/share/doc/smm/01.setup/vax/a.t
@@ -35,8 +35,8 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "Appendix A \- bootstrap details
.ds CF \*(DY
.bp
diff --git a/share/doc/smm/01.setup/vax/b.t b/share/doc/smm/01.setup/vax/b.t
index d79e2337287ef..d5d69630a86bf 100644
--- a/share/doc/smm/01.setup/vax/b.t
+++ b/share/doc/smm/01.setup/vax/b.t
@@ -35,8 +35,8 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "Appendix B \- loading the tape monitor
.ds CF \*(DY
.bp
diff --git a/share/doc/smm/01.setup/vax/c.t b/share/doc/smm/01.setup/vax/c.t
index 3667b847a6698..c504eed03afb3 100644
--- a/share/doc/smm/01.setup/vax/c.t
+++ b/share/doc/smm/01.setup/vax/c.t
@@ -35,8 +35,8 @@
\fI\\$1\fP\|\\$2
..
.ds LH "Installing/Operating \*(4B
-.nr H1 6
-.nr H2 0
+.\".nr H1 6
+.\".nr H2 0
.ds RH "Appendix C \- installation troubleshooting
.ds CF \*(DY
.bp
diff --git a/share/doc/smm/01.setup/vax/vaxhints.t b/share/doc/smm/01.setup/vax/vaxhints.t
index 6ef88ae1efb9d..b727c83be8031 100644
--- a/share/doc/smm/01.setup/vax/vaxhints.t
+++ b/share/doc/smm/01.setup/vax/vaxhints.t
@@ -35,6 +35,7 @@
.ds rq ''
.ds 4B 4.3BSD-tahoe
.nr Vx 1 \" VAX version
+.nr Th 0
.ds Mc VAX
.ds mC vax
.ds Dk hp
@@ -227,7 +228,7 @@ compatible between 4.2BSD, \*(Ps, and \*(4B,
though running a \*(4B file system under older systems
may cause more of the above
messages to be generated the next time it is \fIfsck\fP'ed on \*(4B.
-.NH 2
+.SH
Hints on converting from 4.3BSD to \*(4B
.PP
The largest visible change between 4.3BSD to \*(4B
diff --git a/share/doc/smm/02.config/0.t b/share/doc/smm/02.config/0.t
index f262c5342ac2d..0edf51f727576 100644
--- a/share/doc/smm/02.config/0.t
+++ b/share/doc/smm/02.config/0.t
@@ -31,6 +31,7 @@
.\"
.\" @(#)0.t 6.4 (Berkeley) 4/17/91
.\"
+.nr GA 0
.bd S B 3
.de UX
.ie \\n(GA>0 \\$2UNIX\\$1
@@ -38,10 +39,8 @@
.if n \\$2UNIX\\$1*
.if t \\$2UNIX\\$1\\f1\(dg\\fP
.FS
-.if n *UNIX
-.if t \(dgUNIX
-.ie \\$3=1 is a Footnote of Bell Laboratories.
-.el is a Trademark of Bell Laboratories.
+.if n *UNIX is a Trademark of Bell Laboratories.
+.if t \(dgUNIX is a Trademark of Bell Laboratories.
.FE
.nr GA 1\}
..
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index 59b81650becf5..5793a185ce8c7 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:49 mycroft Exp
-DIR= smm/02.config
+VOLUME= smm
DOC= 02.config
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index c832258d3eb5e..2a7450ec8f671 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:41 mycroft Exp
-DIR= smm/04.quotas
+VOLUME= smm
DOC= 04.quotas
SRCS= quotas.ms
diff --git a/share/doc/smm/05.fsck/Makefile b/share/doc/smm/05.fsck/Makefile
index a08844477db82..6356d4fcc348c 100644
--- a/share/doc/smm/05.fsck/Makefile
+++ b/share/doc/smm/05.fsck/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 4.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:32 mycroft Exp
-DIR= smm/05.fsck
+VOLUME= smm
DOC= 05.fsck
SRCS= 0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/smm/06.lpd/Makefile b/share/doc/smm/06.lpd/Makefile
index 7408218482e8f..774dd9eb01233 100644
--- a/share/doc/smm/06.lpd/Makefile
+++ b/share/doc/smm/06.lpd/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:23 mycroft Exp
-DIR= smm/06.lpd
+VOLUME= smm
DOC= 06.lpd
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
diff --git a/share/doc/smm/07.sendmailop/Makefile b/share/doc/smm/07.sendmailop/Makefile
index c1a5bd6e73419..a808923b0c0e9 100644
--- a/share/doc/smm/07.sendmailop/Makefile
+++ b/share/doc/smm/07.sendmailop/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:13 mycroft Exp
-DIR= smm/07.sendmailop
+VOLUME= smm
DOC= 07.sendmailop
SRCS= op.me
diff --git a/share/doc/smm/08.timedop/Makefile b/share/doc/smm/08.timedop/Makefile
index a6ec7131df0e0..131f14159f9ae 100644
--- a/share/doc/smm/08.timedop/Makefile
+++ b/share/doc/smm/08.timedop/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:32:03 mycroft Exp
-DIR= smm/08.timedop
+VOLUME= smm
DOC= 08.timedop
SRCS= timed.ms
diff --git a/share/doc/smm/10.newsop/Makefile b/share/doc/smm/10.newsop/Makefile
index 04cd3b602a257..fe71fa9f7322a 100644
--- a/share/doc/smm/10.newsop/Makefile
+++ b/share/doc/smm/10.newsop/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:54 mycroft Exp
-DIR= smm/10.newsop
+VOLUME= smm
DOC= 10.newsop
SSRC= tmac.n standard.mn
diff --git a/share/doc/smm/10.newsop/tmac.n b/share/doc/smm/10.newsop/tmac.n
index bdcd225625525..a51e0008d2f8e 100644
--- a/share/doc/smm/10.newsop/tmac.n
+++ b/share/doc/smm/10.newsop/tmac.n
@@ -648,3 +648,4 @@
.\" couple of miscellaneous requests
.bd S 3 3 \" embolden special font chars if B
.hy 2 \" don't hyphenate last lines
+.za \" save everything
diff --git a/share/doc/smm/11.named/Makefile b/share/doc/smm/11.named/Makefile
index ef461a5629699..8030b70bb5304 100644
--- a/share/doc/smm/11.named/Makefile
+++ b/share/doc/smm/11.named/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.4 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:45 mycroft Exp
-DIR= smm/11.named
+VOLUME= smm
DOC= 11.named
SRCS= 00macs.me 00title.me intro.me build.me types.me setup.me \
diff --git a/share/doc/smm/11.named/named.local b/share/doc/smm/11.named/named.local
index 45de227de762c..02b84b01ed645 100644
--- a/share/doc/smm/11.named/named.local
+++ b/share/doc/smm/11.named/named.local
@@ -38,10 +38,10 @@
l l l l.
@ IN SOA ucbvax\fB.\fPBerkeley\fB.\fPEdu. kjd\fB.\fPucbvax\fB.\fPBerkeley\fB.\fPEdu\fB.\fP (
1 ; Serial
- 10800 ; Refresh
- 1800 ; Retry
- 3600000 ; Expire
- 86400 ) ; Minimum
+ 10800 ; Refresh
+ 1800 ; Retry
+ 3600000 ; Expire
+ 86400 ) ; Minimum
IN NS ucbvax\fB.\fPBerkeley\fB.\fPEdu\fB.\fP
1 IN PTR localhost\fB.\fP
.TE
diff --git a/share/doc/smm/14.fastfs/Makefile b/share/doc/smm/14.fastfs/Makefile
index ba3c93ddca516..dac735b2d2f8a 100644
--- a/share/doc/smm/14.fastfs/Makefile
+++ b/share/doc/smm/14.fastfs/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:35 mycroft Exp
-DIR= smm/14.fastfs
+VOLUME= smm
DOC= 14.fastfs
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/15.net/Makefile b/share/doc/smm/15.net/Makefile
index af996f4d0bd09..ae1cfa0c442f2 100644
--- a/share/doc/smm/15.net/Makefile
+++ b/share/doc/smm/15.net/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:26 mycroft Exp
-DIR= smm/15.net
+VOLUME= smm
DOC= 15.net
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
diff --git a/share/doc/smm/16.sendmail/Makefile b/share/doc/smm/16.sendmail/Makefile
index a50c4a679c861..716d7aa0e5c9b 100644
--- a/share/doc/smm/16.sendmail/Makefile
+++ b/share/doc/smm/16.sendmail/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:17 mycroft Exp
-DIR= smm/16.sendmail
+VOLUME= smm
DOC= 16.sendmail
SRCS= intro.me
diff --git a/share/doc/smm/20.termdesc/Makefile b/share/doc/smm/20.termdesc/Makefile
index f0f41d5b160a5..80755bcdb5fca 100644
--- a/share/doc/smm/20.termdesc/Makefile
+++ b/share/doc/smm/20.termdesc/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:31:08 mycroft Exp
-DIR= smm/20.termdesc
+VOLUME= smm
DOC= 20.termdesc
SRCS= termdesc.me
diff --git a/share/doc/smm/22.timed/Makefile b/share/doc/smm/22.timed/Makefile
index 6c127d185566b..eeb0bf0fa9712 100644
--- a/share/doc/smm/22.timed/Makefile
+++ b/share/doc/smm/22.timed/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:30:59 mycroft Exp
-DIR= smm/22.timed
+VOLUME= smm
DOC= 22.timed
SRCS= timed.ms
diff --git a/share/doc/smm/22.timed/timed.ms b/share/doc/smm/22.timed/timed.ms
index 17da2ddb3eca4..054fc4bf50db5 100644
--- a/share/doc/smm/22.timed/timed.ms
+++ b/share/doc/smm/22.timed/timed.ms
@@ -180,7 +180,7 @@ one of three states: slave, master, or candidate for election to master.
Also, the term \fIbroadcast\fP refers to
the sending of a message to all active time daemons.
.sp 1
-.DS L
+.\".DS L
.SH
Adjtime Message
.so time
@@ -196,8 +196,8 @@ The slave will accordingly
adjust the time of its machine.
This message requires an acknowledgment.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Acknowledgment Message
.so unused
@@ -210,8 +210,8 @@ acknowledgment only.
It is used in several different contexts, for example
in reply to an Adjtime message.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Master Request Message
.so unused
@@ -223,8 +223,8 @@ A newly-started time daemon broadcasts this message to
locate a master. No other action is implied by this packet.
It requires a Master Acknowledgment.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Master Acknowledgement
.so unused
@@ -235,8 +235,8 @@ Type: TSP_MASTERACK (4)
The master sends this message to acknowledge the Master Request message
and the Conflict Resolution Message.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Set Network Time Message
.so date
@@ -253,8 +253,8 @@ The next
synchronization round will eliminate the small time difference
caused by the random delay in the communication channel.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Master Active Message
.so unused
@@ -266,8 +266,8 @@ The master broadcasts this message to
solicit the names of the active slaves.
Slaves will reply with a Slave Active message.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Slave Active Message
.so unused
@@ -279,8 +279,8 @@ A slave sends this message to the master in answer to a Master Active message.
This message is also sent when a new slave starts up to inform the master that
it wants to be synchronized.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Master Candidature Message
.so unused
@@ -292,8 +292,8 @@ A slave eligible to become a master broadcasts this message when its election
timer expires.
The message declares that the slave wishes to become the new master.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Candidature Acceptance Message
.so unused
@@ -306,8 +306,8 @@ that has broadcast an Election message.
The candidate will add the slave's name to the list of machines that it
will control should it become the master.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Candidature Rejection Message
.so unused
@@ -320,8 +320,8 @@ to any election messages from other slaves
with this message.
This rejects any candidature other than the first received.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Multiple Master Notification Message
.so unused
@@ -332,8 +332,8 @@ Type: TSP_CONFLICT (11)
When two or more masters reply to a Master Request message, the slave
uses this message to inform one of them that more than one master exists.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Conflict Resolution Message
.so unused
@@ -344,8 +344,8 @@ Type: TSP_RESOLVE (12)
A master which has been informed of the existence of other masters
broadcasts this message to determine who the other masters are.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Quit Message
.so unused
@@ -360,8 +360,8 @@ This message is sent by the master in three different contexts:
In all cases, the recipient time daemon will become a slave.
This message requires an acknowledgement.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Set Date Message
.so date
@@ -374,8 +374,8 @@ when a super-user wants to set the network date.
If the local time daemon is the master, it will set the date;
if it is a slave, it will communicate the desired date to the master.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Set Date Request Message
.so date
@@ -386,8 +386,8 @@ Type: TSP_SETDATEREQ (23)
A slave that has received a Set Date message will communicate the
desired date to the master using this message.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Set Date Acknowledgment Message
.so unused
@@ -401,8 +401,8 @@ The same message is sent by the local time daemon to the program
\fIdate(1)\fP to confirm that the network date has been set by the
master.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Start Tracing Message
.so unused
@@ -414,8 +414,8 @@ The controlling program \fItimedc\fP sends this message to the local
time daemon to start the recording in a system file of
all messages received.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Stop Tracing Message
.so unused
@@ -427,8 +427,8 @@ Type: TSP_TRACEOFF (18)
time daemon to stop the recording of
messages received.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Master Site Message
.so unused
@@ -439,8 +439,8 @@ Type: TSP_MSITE (19)
\fITimedc\fP sends this message to the local time daemon to find out
where the master is running.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Remote Master Site Message
.so unused
@@ -453,8 +453,8 @@ of the master.
It then uses the Acknowledgement message to
communicate this location to \fItimedc\fP.
.sp 1
-.DE
-.DS L
+.\".DE
+.\".DS L
.SH
Test Message
.so unused
@@ -466,9 +466,9 @@ For testing purposes, \fItimedc\fP sends this message to a slave
to cause its election timer to expire. NOTE: \fItimed\fP
is not normally compiled to support this.
.sp 1
-.DE
+.\".DE
.SH
-.DS L
+.\".DS L
.SH
Loop Detection Message
.so loop
@@ -480,7 +480,7 @@ This packet is initiated by all masters occasionally to attempt to detect loops.
All submasters forward this packet onto the networks over which they are master.
If a master receives a packet it sent out initially,
it knows that a loop exists and tries to correct the problem.
-.DE
+.\".DE
.SH
References
.IP 1.
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 9cd9988372dfd..cd5b7f9326f02 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -4,18 +4,12 @@
# Missing: 03.kdebug 09.uucpimpl 12.uchanges 13.kchanges 17.security
# 18.password 19.porttour 21.uucpnet
BINDIR= /usr/share/doc/smm
-FILES= 00.contents Makefile Title
-SUBDIR= 02.config 04.quotas 05.fsck 06.lpd 07.sendmailop \
+SUBDIR= Title 00.contents \
+ 01.setup 02.config 04.quotas 05.fsck 06.lpd 07.sendmailop \
08.timedop 10.newsop 11.named \
14.fastfs 15.net 16.sendmail \
20.termdesc 22.timed
-.if ${MACHINE} == "tahoe"
-SUBDIR+=01.setup
-.elif ${MACHINE} == "vax"
-SUBDIR+=01.setup
-.endif
-
beforeinstall:
@if [ ! -d ${DESTDIR}${BINDIR} ]; then \
/bin/rm -f ${DESTDIR}${BINDIR} ; \
@@ -25,7 +19,5 @@ beforeinstall:
else \
true ; \
fi
- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
- ${DESTDIR}${BINDIR}
.include <bsd.subdir.mk>
diff --git a/share/doc/smm/Title/Makefile b/share/doc/smm/Title/Makefile
new file mode 100644
index 0000000000000..4da6a6384bda0
--- /dev/null
+++ b/share/doc/smm/Title/Makefile
@@ -0,0 +1,9 @@
+VOLUME= smm
+DOC= Title
+
+SRCS= Title
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/smm/Title b/share/doc/smm/Title/Title
index ecf615cd5ee4f..88db7713f3c89 100644
--- a/share/doc/smm/Title
+++ b/share/doc/smm/Title/Title
@@ -91,60 +91,60 @@ The views and conclusions contained in these documents are those of the
authors and should not be interpreted as representing official policies,
either expressed or implied, of the Defense Research Projects Agency
or of the US Government.
-.br
-.ll 6.5i
-.lt 6.5i
-.po .75i
-.in 0i
-.af % i
-.ds ET\"
-.de HD
-.po 0
-.lt 7.4i
-.tl ''''
-.lt
-.po
-'sp 18p
-.if o .tl '\\*(ET''- % -'
-.if e .tl '- % -''\\*(ET'
-'sp 18p
-.ns
-..
-.de FO
-'sp 18p
-.if e .tl '\s9\\*(Dt''\\*(Ed\s0'
-.if o .tl '\s9\\*(Ed''\\*(Dt\s0'
-'bp
-..
-.wh 0 HD
-.wh -60p FO
-.bp 1
-.ds ET \s9\f2Table \|of \|Contents\fP\s0
-.ds Ed 4.3BSD
-.ds Dt April \|1986
-.ce
-\f3TABLE \|OF \|CONTENTS\fP
-.nr x .5i
-.in +\nxu
-.nf
-.ta \n(.lu-\nxuR
-.de xx
-\\$1\f3 \a \fP\\$2
-..
-.de t
-.sp 1v
-.ne .5i
-.cs 3
-.ti -.5i
-.ss 18
-\f3\s9\\$2. \\$3\s0\fP
-.ss 12
-.if t .sp .5v
-.cs 3 36
-.so \\$1
-..
-.t /usr/man/man0/toc8 8 "System Maintenance"
-.in -.5i
-.cs 3
-.if n .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 80n
-.if t .ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.\".br
+.\".ll 6.5i
+.\".lt 6.5i
+.\".po .75i
+.\".in 0i
+.\".af % i
+.\".ds ET\"
+.\".de HD
+.\".po 0
+.\".lt 7.4i
+.\".tl ''''
+.\".lt
+.\".po
+.\"'sp 18p
+.\".if o .tl '\\*(ET''- % -'
+.\".if e .tl '- % -''\\*(ET'
+.\"'sp 18p
+.\".ns
+.\"..
+.\".de FO
+.\"'sp 18p
+.\".if e .tl '\s9\\*(Dt''\\*(Ed\s0'
+.\".if o .tl '\s9\\*(Ed''\\*(Dt\s0'
+.\"'bp
+.\"..
+.\".wh 0 HD
+.\".wh -60p FO
+.\".bp 1
+.\".ds ET \s9\f2Table \|of \|Contents\fP\s0
+.\".ds Ed 4.3BSD
+.\".ds Dt April \|1986
+.\".ce
+.\"\f3TABLE \|OF \|CONTENTS\fP
+.\".nr x .5i
+.\".in +\nxu
+.\".nf
+.\".ta \n(.lu-\nxuR
+.\".de xx
+.\"\\$1\f3 \a \fP\\$2
+.\"..
+.\".de t
+.\".sp 1v
+.\".ne .5i
+.\".cs 3
+.\".ti -.5i
+.\".ss 18
+.\"\f3\s9\\$2. \\$3\s0\fP
+.\".ss 12
+.\".if t .sp .5v
+.\".cs 3 36
+.\".so \\$1
+.\"..
+.\".t /usr/man/man0/toc8 8 "System Maintenance"
+.\".in -.5i
+.\".cs 3
+.\".if n .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 80n
+.\".if t .ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
diff --git a/share/doc/usd/00.contents b/share/doc/usd/00.contents/00.contents
index 123ee6b1cccb3..123ee6b1cccb3 100644
--- a/share/doc/usd/00.contents
+++ b/share/doc/usd/00.contents/00.contents
diff --git a/share/doc/usd/00.contents/Makefile b/share/doc/usd/00.contents/Makefile
new file mode 100644
index 0000000000000..db20edde23a26
--- /dev/null
+++ b/share/doc/usd/00.contents/Makefile
@@ -0,0 +1,10 @@
+VOLUME= usd
+DOC= 00.contents
+
+SRCS= 00.contents
+MACROS= -ms
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index c1ad7261ebe07..b0b8ee3a2eb3f 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.1 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:30:49 mycroft Exp
-DIR= usd/04.csh
+VOLUME= usd
DOC= 04.csh
SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/share/doc/usd/07.Mail/Makefile b/share/doc/usd/07.Mail/Makefile
index 84b79b019d0d3..8496d9dca1f59 100644
--- a/share/doc/usd/07.Mail/Makefile
+++ b/share/doc/usd/07.Mail/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:30:41 mycroft Exp
-DIR= usd/07.Mail
+VOLUME= usd
DOC= 07.Mail
SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
diff --git a/share/doc/usd/09.newsread/Makefile b/share/doc/usd/09.newsread/Makefile
index b860a67fea377..39b6d8a4e1707 100644
--- a/share/doc/usd/09.newsread/Makefile
+++ b/share/doc/usd/09.newsread/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:30:35 mycroft Exp
-DIR= usd/09.newsread
+VOLUME= usd
DOC= 09.newsread
CSRC= ../../smm/10.newsop/tmac.n copyright.mn
diff --git a/share/doc/usd/10.etiq/Makefile b/share/doc/usd/10.etiq/Makefile
index 028cb1c43a1f8..c9e52d03ba359 100644
--- a/share/doc/usd/10.etiq/Makefile
+++ b/share/doc/usd/10.etiq/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:30:28 mycroft Exp
-DIR= usd/10.etiq
+VOLUME= usd
DOC= 10.etiq
SRCS= ../../smm/10.newsop/tmac.n manner.mn
diff --git a/share/doc/usd/11.notes/Makefile b/share/doc/usd/11.notes/Makefile
index ac00ef3cb919f..9706b273ec6cd 100644
--- a/share/doc/usd/11.notes/Makefile
+++ b/share/doc/usd/11.notes/Makefile
@@ -15,7 +15,7 @@
# and a typesetter. Hopefully the only changes to make it
# run again under nroff will be in page length/width statements.
-DIR= usd/11.notes
+VOLUME= usd
DOC= 11.notes
SRCS= macros 0.long \
diff --git a/share/doc/usd/14.edit/Makefile b/share/doc/usd/14.edit/Makefile
index 358e9fe9bf07d..293c4f9268fdb 100644
--- a/share/doc/usd/14.edit/Makefile
+++ b/share/doc/usd/14.edit/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.5 1993/07/31 15:30:17 mycroft Exp
-DIR= usd/14.edit
+VOLUME= usd
DOC= 14.edit
SRCS= edittut.ms
diff --git a/share/doc/usd/14.edit/edittut.ms b/share/doc/usd/14.edit/edittut.ms
index 94858f67f1a9b..ba4718113c457 100644
--- a/share/doc/usd/14.edit/edittut.ms
+++ b/share/doc/usd/14.edit/edittut.ms
@@ -1034,7 +1034,8 @@ Instead, you may identify the line you want to change
by asking edit to search for a specified pattern of letters
that occurs in that line.
The parts of the above command are:
-.TS
+.\".TS
+.sp 1
.in +1i
.nr 35 \n(.u
.nf
@@ -1083,7 +1084,8 @@ The parts of the above command are:
.T# 1
.if \n(35>0 .fi
.in -1i
-.TE
+.\".TE
+.sp 1
.PP
You should note the space after ``but'' in ``/strange, but /''.
If you do not indicate that the space is to be taken out,
diff --git a/share/doc/usd/15.vi/Makefile b/share/doc/usd/15.vi/Makefile
index 9ff48b80ed46d..4f9d91edbb948 100644
--- a/share/doc/usd/15.vi/Makefile
+++ b/share/doc/usd/15.vi/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:30:11 mycroft Exp
-DIR= usd/15.vi
+VOLUME= usd
DOC= 15.vi
SRCS= vi.in vi.chars
diff --git a/share/doc/usd/15.vi/vi.apwh.ms b/share/doc/usd/15.vi/vi.apwh.ms
index 7c8a0e4607062..0703baf0cf405 100644
--- a/share/doc/usd/15.vi/vi.apwh.ms
+++ b/share/doc/usd/15.vi/vi.apwh.ms
@@ -37,7 +37,7 @@ Vi Command & Function Reference
Alan P.W. Hewett
.sp
Revised for version 2.12 by Mark Horton
-.CB
+.\".CB
.NH 1
Author's Disclaimer
.LP
@@ -83,7 +83,7 @@ be denoted using the \fIupper case\fR character, but
example, \fB<^D>\fR is equal to \fB<^d>\fR.
The most common character abbreviations
used in this list are as follows:
-.VL 8
+.\".VL 8
.IP <esc> 8
escape, octal 033
.IP <cr> 8
@@ -104,7 +104,7 @@ formfeed, ^L, octal 014
space, octal 040
.IP <del> 8
delete, octal 0177
-.LE
+.\".LE
.sp 1
.NH 1
Basics
@@ -216,7 +216,7 @@ be necessary to type <esc> first.
.NH 2
Cursor and Page Motion
.LP
-.VL 16
+.\".VL 16
.B NOTE:
The arrow keys (see the next four commands)
on certain kinds of terminals will not work with the
@@ -378,12 +378,12 @@ cursor or scrolling the screen.
.IP "\(ga\(ga" 16
Move the cursor back to the exact spot on the line where it was located
before the last "non-relative" move.
-.LE
+.\".LE
.NH 2
Searches
.LP
The following commands allow you to search for items in a file.
-.VL 16
+.\".VL 16
.IP [cnt]f{chr} 16
.sp 1
Search forward on the line for the next or "cnt"'th occurrence of
@@ -431,7 +431,7 @@ direction.
.sp 1
Using the \fB:\fR syntax it is possible to do global searches ala the
standard UNIX "ed" editor.
-.LE
+.\".LE
.NH 2
Text Insertion
.LP
@@ -440,7 +440,7 @@ text insertions are terminated with an <esc> character.
The last change
can always be \fBundone\fR by typing a \fBu\fR.
The text insert in insertion mode can contain newlines.
-.VL 16
+.\".VL 16
.IP a{text}<esc> 16
Insert text immediately following the cursor position.
Mnemonic: \fBa\fRppend
@@ -458,13 +458,13 @@ insert text there. Mnemonic: \fBo\fRpen new line
.IP O{text}<esc> 16
Insert a new line preceding the line on which the cursor appears
and insert text there.
-.LE
+.\".LE
.NH 2
Text Deletion
.LP
The following commands allow the user to delete text in various ways.
All changes can always be \fBundone\fR by typing the \fBu\fR command.
-.VL 16
+.\".VL 16
.IP "[cnt]x" 16
Delete the character or characters starting at the cursor position.
.IP "[cnt]X" 16
@@ -478,14 +478,14 @@ Mnemonic: \fBD\fRelete the rest of line
Deletes one or more occurrences of the specified motion.
Any motion from sections 4.1 and 4.2 can be used here.
The d can be stuttered (e.g. [cnt]dd) to delete cnt lines.
-.LE
+.\".LE
.NH 2
Text Replacement
.LP
The following commands allow the user to simultaneously delete and
insert new text. All such actions can be \fBundone\fR by typing
\fBu\fR following the command.
-.VL 16
+.\".VL 16
.IP "r<chr>" 16
Replaces the character at the current cursor position with <chr>. This
is a one character replacement. No <esc> is required for termination.
@@ -510,7 +510,7 @@ insertion text. A "$" will appear at the end of the last item
that is being deleted unless the deletion involves whole lines.
Motion's can be any motion from sections 4.1 or 4.2.
Stuttering the c (e.g. [cnt]cc) changes cnt lines.
-.LE
+.\".LE
.NH 2
Moving Text
.LP
@@ -534,7 +534,7 @@ in such a buffer is appended to it instead of replacing it.
.FE
There are two more basic commands and
some variations useful in getting and putting text into a file.
-.VL 16
+.\".VL 16
.IP ["<a-z>][cnt]y{motion} 16
.sp 1
Yank the specified item or "cnt" items and put in the "undo" buffer or
@@ -584,13 +584,13 @@ Prettyprints the indicated area according to
.B lisp
conventions.
The area should be a lisp s-expression.
-.LE
+.\".LE
.NH 2
Miscellaneous Commands
.LP
\fBVi\fR has a number of miscellaneous commands that are very
useful. They are:
-.VL 16
+.\".VL 16
.IP ZZ 16
This is the normal way to exit from vi.
If any changes have been made, the file is written out.
@@ -656,13 +656,13 @@ To just escape to the shell for one command,
use :!{cmd}<nl>, see section 5.
.IP z{cnt}<nl> 16
This resets the current window size to "cnt" lines and redraws the screen.
-.LE
+.\".LE
.NH 2
Special Insert Characters
.LP
There are some characters that have special meanings during
insert modes. They are:
-.VL 16
+.\".VL 16
.IP ^V 16
During inserts, typing a ^V allows you to quote control characters
into the file. Any character typed after the ^V will be inserted
@@ -686,7 +686,7 @@ Mnemonic: erase \fBW\fRord
The backspace always serves as an erase during insert modes in addition
to your normal "erase" character. To insert a <bs> into your file, use
the <^V> to quote it.
-.LE
+.\".LE
.NH 1
\fB:\fR Commands
.LP
@@ -696,7 +696,7 @@ the bottom on the screen in preparation for a command. In the
also from this mode that you exit from \fBvi\fR or switch to different
files. All commands of this variety are terminated by a <nl>, <cr>,
or <esc>.
-.VL 16
+.\".VL 16
.IP ":w[!] [file]" 16
Causes \fBvi\fR to write out the current text to the disk. It is
written to the file you are editing unless "file" is supplied. If
@@ -767,7 +767,7 @@ programs so that by saying
\fB:ta function<nl>\fR you will be switched to that function.
It could also be useful when editing multi-file documents, though the
\fBtags\fR file would have to be generated manually.
-.LE
+.\".LE
.NH 1
Special Arrangements for Startup
.PP
@@ -865,7 +865,7 @@ These are usually placed in your .profile or .login.
If you are running a system without environments (such as version 6)
you can place the set command in the file .exrc in your home
directory.
-.VL 16
+.\".VL 16
.IP autoindent\ ai 16
Default: noai Type: toggle
.br
@@ -1076,4 +1076,4 @@ Default: nowa Type: toggle
\fBVi\fR normally makes a number of checks before it writes out a file.
This prevents the user from inadvertently destroying a file. When the
"writeany" option is enabled, \fBvi\fR no longer makes these checks.
-.LE
+.\".LE
diff --git a/share/doc/usd/15.vi/vi.summary b/share/doc/usd/15.vi/vi.summary
index 02ccebd68afd9..45f6c4b03c270 100644
--- a/share/doc/usd/15.vi/vi.summary
+++ b/share/doc/usd/15.vi/vi.summary
@@ -33,6 +33,7 @@
.\"
.ds CH
.ds CF
+.nr 1T 0
.de TS
.br
.if !\\n(1T .RT
diff --git a/share/doc/usd/16.ex/Makefile b/share/doc/usd/16.ex/Makefile
index 0e16269843819..e517ddacf0d7f 100644
--- a/share/doc/usd/16.ex/Makefile
+++ b/share/doc/usd/16.ex/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:30:05 mycroft Exp
-DIR= usd/16.ex
+VOLUME= usd
DOC= 16.ex
SRCS= ex.rm
diff --git a/share/doc/usd/16.ex/ex.rm b/share/doc/usd/16.ex/ex.rm
index 0c47cc6950bb9..923034198c26e 100644
--- a/share/doc/usd/16.ex/ex.rm
+++ b/share/doc/usd/16.ex/ex.rm
@@ -33,6 +33,7 @@
.\"
.EH 'USD:16-%''Ex Reference Manual'
.OH 'Ex Reference Manual''USD:16-%'
+.nr )P 0
.de ZP
.nr pd \\n()P
.nr )P 0
diff --git a/share/doc/usd/16.ex/ex.summary b/share/doc/usd/16.ex/ex.summary
index 06a035d8a31a9..b9c72bf49a896 100644
--- a/share/doc/usd/16.ex/ex.summary
+++ b/share/doc/usd/16.ex/ex.summary
@@ -55,7 +55,7 @@ Ex/Edit Command Summary (Version 2.0)
.nr VS 11
.nr PS 9
.nr HM 0.5i
-.nr CW
+.\".nr CW
.2C
.PP
.I Ex
@@ -251,9 +251,8 @@ rather than with its special meaning,
precede it by a backslash (\\).
The backslash always has a special meaning.
.1C
-.rm LF
-.rm RF
-.rm CF
+.ds LF
+.ds RF
.nr FM 0.4
.TS
cp10 cp10 cp10 cp10
@@ -402,7 +401,7 @@ be added prior to line 1.
\&.
\fR:
.fi
-T} \^
+T}
.SP
\fR(.,.+1)\fBjoin j T{
Join lines together, adjusting white space (spaces
@@ -413,7 +412,7 @@ T} T{
Resulting line is printed
:
.fi
-T} \^
+T}
.TE
.bp
.TS
diff --git a/share/doc/usd/21.msdiffs/Makefile b/share/doc/usd/21.msdiffs/Makefile
index 1e0edbe686fdb..df79858538c33 100644
--- a/share/doc/usd/21.msdiffs/Makefile
+++ b/share/doc/usd/21.msdiffs/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:29:58 mycroft Exp
-DIR= usd/21.msdiffs
+VOLUME= usd
DOC= 21.msdiffs
SRCS= ms.diffs
diff --git a/share/doc/usd/22.memacros/Makefile b/share/doc/usd/22.memacros/Makefile
index 94c9401e2dfa7..b270c48569759 100644
--- a/share/doc/usd/22.memacros/Makefile
+++ b/share/doc/usd/22.memacros/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.4 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:29:52 mycroft Exp
-DIR= usd/22.memacros
+VOLUME= usd
DOC= 22.memacros
SRCS= intro.me
diff --git a/share/doc/usd/23.meref/Makefile b/share/doc/usd/23.meref/Makefile
index 72a3b03548a19..6a4a9cbbe48cb 100644
--- a/share/doc/usd/23.meref/Makefile
+++ b/share/doc/usd/23.meref/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.4 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:29:46 mycroft Exp
-DIR= usd/23.meref
+VOLUME= usd
DOC= 23.meref
SRCS= ref.me
diff --git a/share/doc/usd/33.rogue/Makefile b/share/doc/usd/33.rogue/Makefile
index 61951092d1c14..3a050e08b568a 100644
--- a/share/doc/usd/33.rogue/Makefile
+++ b/share/doc/usd/33.rogue/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.3 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:29:41 mycroft Exp
-DIR= usd/33.rogue
+VOLUME= usd
DOC= 33.rogue
SRCS= rogue.me
diff --git a/share/doc/usd/34.trek/Makefile b/share/doc/usd/34.trek/Makefile
index 48584e730d0fd..ed2ece10c9f5d 100644
--- a/share/doc/usd/34.trek/Makefile
+++ b/share/doc/usd/34.trek/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 6.2 (Berkeley) 6/30/90
# Makefile,v 1.4 1993/07/31 15:29:34 mycroft Exp
-DIR= usd/34.trek
+VOLUME= usd
DOC= 34.trek
SRCS= trek.me
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index dad7234f55c54..6cae2c4c0e939 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -6,8 +6,8 @@
# 27.eqnguide 28.tbl 29.refer 30.invert 31.bib 32.diction
BINDIR= /usr/share/doc/usd
-FILES= 00.contents Makefile Title
-SUBDIR= 04.csh 07.Mail \
+SUBDIR= Title 00.contents \
+ 04.csh 07.Mail \
09.newsread 10.etiq 11.notes 14.edit 15.vi \
16.ex 21.msdiffs 22.memacros \
23.meref \
@@ -22,7 +22,5 @@ beforeinstall:
else \
true ; \
fi
- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
- ${DESTDIR}${BINDIR}
.include <bsd.subdir.mk>
diff --git a/share/doc/usd/Title/Makefile b/share/doc/usd/Title/Makefile
new file mode 100644
index 0000000000000..e7520803fec5a
--- /dev/null
+++ b/share/doc/usd/Title/Makefile
@@ -0,0 +1,9 @@
+VOLUME= usd
+DOC= Title
+
+SRCS= Title
+
+.include <bsd.doc.mk>
+
+${DOC}.${PRINTER}: ${SRCS}
+ ( cd ${.CURDIR} ; ${ROFF} ${SRCS} ) > ${.TARGET}
diff --git a/share/doc/usd/Title b/share/doc/usd/Title/Title
index 0dec26046288a..0dec26046288a 100644
--- a/share/doc/usd/Title
+++ b/share/doc/usd/Title/Title