- add .txt targets for Title and 00.contents

- add margin when formatting w/ -Tascii
- sync usd contents w/ reality
- kill whitespace at eol
- punctuation fixes

3 files changed, 48 insertions, 36 deletions

diff --git a/share/doc/usd/00.contents b/share/doc/usd/00.contents
index fc2d097c698..e5c3bd5e35b 100644
--- a/share/doc/usd/00.contents
+++ b/share/doc/usd/00.contents
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: 00.contents,v 1.3 2003/06/02 23:30:11 millert Exp $
+.\"	$OpenBSD: 00.contents,v 1.4 2004/04/09 12:10:04 jmc Exp $
 .\"
 .\" Copyright (c) 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,6 +29,10 @@
 .\"
 .\"	@(#)00.contents	8.2 (Berkeley) 4/20/94
 .\"
+.if n \{\
+.po 5n
+.ll 70n
+.\}
 .de ND
 .KE
 .sp
@@ -70,16 +74,16 @@ Basic Utilities
 .IP
 .tl 'An Introduction to the UNIX Shell''USD:3'
 .QP
-Steve Bourne's introduction to the capabilities of 
-.I sh,
+Steve Bourne's introduction to the capabilities of
+.I sh ,
 a command interpreter especially popular for writing shell scripts.
 .ND
 .IP
 .tl 'An Introduction to the C shell''USD:4'
 .QP
 This introduction to
-.I csh,
-(a command interpreter popular for interactive work)  describes many 
+.I csh
+(a command interpreter popular for interactive work), describes many
 commonly used UNIX commands, assumes little prior knowledge of UNIX,
 and has a glossary useful for beginners.
 .ND
@@ -91,7 +95,7 @@ A super HP calculator, if you do not need floating point.
 .IP
 .tl 'BC \- An Arbitrary Precision Desk-Calculator Language''USD:6'
 .QP
-A front end for DC that provides infix notation, control flow, and 
+A front end for DC that provides infix notation, control flow, and
 built\-in functions.
 .ND
 .SH
@@ -105,7 +109,7 @@ Complete details on one of the programs for sending and reading your mail.
 .IP
 .tl 'The Rand MH Message Handling System''USD:8'
 .QP
-This system for managing your computer mail uses lots of small programs, 
+This system for managing your computer mail uses lots of small programs,
 instead of one large one.
 .ND
 .SH
@@ -114,8 +118,8 @@ Text Editing
 .IP
 .tl 'A Tutorial Introduction to the Unix Text Editor''USD:9'
 .QP
-An easy way to get started with the line editor, 
-.I ed.
+An easy way to get started with the line editor,
+.I ed .
 .ND
 .IP
 .tl 'Advanced Editing on Unix''USD:10'
@@ -123,31 +127,31 @@ An easy way to get started with the line editor,
 The next step.
 .ND
 .IP
-.tl 'An Introduction to Display Editing with Vi''USD:11'
+.tl 'Ex: A Tutorial''USD:11'
 .QP
-The document to learn to use the \fIvi\fR screen editor.
+The document to learn to use the \fIex\fR editor.
 .ND
 .IP
-.tl 'Ex Reference Manual (Version 3.7)''USD:12'
+.tl 'An Introduction to Display Editing with Vi''USD:12'
 .QP
-The final reference for the \fIex\fR editor.
+The document to learn to use the \fIvi\fR screen editor.
 .ND
 .IP
-.tl 'Vi Reference Manual''USD:13'
+.tl 'Vi/Ex Reference Manual''USD:13'
 .QP
-The definitive reference for the \fInvi\fR editor.
+The definitive reference for the \fInvi\fR,\fInex\fR editors.
 .ND
 .IP
 .tl 'Jove Manual for UNIX Users''USD:14'
 .QP
 Jove is a small, self-documenting, customizable display editor, based on
-EMACS.  A plausible alternative to 
-.I vi.
+EMACS.  A plausible alternative to
+.I vi .
 .ND
 .IP
 .tl 'SED \- A Non-interactive Text Editor''USD:15'
 .QP
-Describes a one-pass variant of 
+Describes a one-pass variant of
 .I ed
 useful as a filter for processing large files.
 .ND
@@ -162,8 +166,8 @@ Document Preparation
 .IP
 .tl 'Typing Documents on UNIX: Using the \-ms Macros with Troff and Nroff''USD:17'
 .QP
-Describes and gives examples of the basic use of the typesetting tools and 
-``-ms'', a frequently used package of formatting requests that make it easier 
+Describes and gives examples of the basic use of the typesetting tools and
+``-ms'', a frequently used package of formatting requests that make it easier
 to lay out most documents.
 .ND
 .IP
@@ -176,7 +180,7 @@ macros for nroff and troff.
 .tl 'Writing Papers with \fInroff\fR using \-me''USD:19'
 .QP
 Another popular macro package for
-.I nroff.
+.I nroff .
 .ND
 .IP
 .tl '\-me Reference Manual''USD:20'
@@ -192,22 +196,22 @@ Extremely detailed information about these document formatting programs.
 .tl 'A TROFF Tutorial''USD:22'
 .QP
 An introduction to the most basic uses of
-.I troff 
-for those who really want to know such things, or want to write their 
+.I troff
+for those who really want to know such things, or want to write their
 own macros.
 .ND
 .IP
 .tl 'A System for Typesetting Mathematics''USD:23'
 .QP
-Describes 
-.I eqn, 
+Describes
+.I eqn ,
 an easy-to-learn language for high-quality mathematical typesetting.
 .ND
 .IP
 .tl 'Typesetting Mathematics \- User\'s Guide (Second Edition)''USD:24'
 .QP
-More details about how to use 
-.I eqn.
+More details about how to use
+.I eqn .
 .ND
 .IP
 .tl 'Tbl \- A Program to Format Tables''USD:25'
@@ -217,17 +221,17 @@ A program for easily typesetting tabular material.
 .IP
 .tl 'Refer \- A Bibliography System''USD:26'
 .QP
-An introduction to one set of tools used to maintain bibliographic databases. 
-The major program, 
-.I refer,
-is used to automatically retrieve and format the references 
+An introduction to one set of tools used to maintain bibliographic databases.
+The major program,
+.I refer ,
+is used to automatically retrieve and format the references
 based on document citations.
 .ND
 .IP
 .tl 'Some Applications of Inverted Indexes on the UNIX System''USD:27'
 .QP
 Mike Lesk's paper describes the
-.I refer 
+.I refer
 programs in a somewhat larger context.
 .ND
 .IP
@@ -240,10 +244,10 @@ for expanding citations in documents.
 .IP
 .tl 'Writing Tools \- The STYLE and DICTION Programs''USD:29'
 .QP
-These are programs which can help you understand and improve your 
+These are programs which can help you understand and improve your
 writing style.
 .ND
-.SH 
+.SH
 Amusements
 .ND
 .IP
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index c616541fc09..1ed7b82c017 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2004/02/10 07:28:36 jmc Exp $
+#	$OpenBSD: Makefile,v 1.6 2004/04/09 12:10:04 jmc Exp $
 
 # Missing or not installed:
 # 02.learn 03.shell 05.dc 08.mh 14.jove
@@ -11,9 +11,13 @@ SUBDIR=	01.begin 17.msmacros 18.msdiffs 19.memacros 20.meref
 
 Title.ps: ${FILES}
 	groff Title > ${.TARGET}
+Title.txt: ${FILES}
+	groff -Tascii Title > ${.TARGET}
 
 contents.ps: ${FILES}
 	groff -ms 00.contents > ${.TARGET}
+contents.txt: ${FILES}
+	groff -Tascii -ms 00.contents > ${.TARGET}
 
 beforeinstall:
 	install -c -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} ${FILES} \
diff --git a/share/doc/usd/Title b/share/doc/usd/Title
index fd18f087ba6..4dca1107aeb 100644
--- a/share/doc/usd/Title
+++ b/share/doc/usd/Title
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: Title,v 1.4 2003/06/04 16:47:20 deraadt Exp $
+.\"	$OpenBSD: Title,v 1.5 2004/04/09 12:10:04 jmc Exp $
 .\"
 .\" Copyright (c) 1986, 1993 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,6 +29,10 @@
 .\"
 .\"	@(#)Title	8.2 (Berkeley) 4/19/94
 .\"
+.if n \{\
+.po 5n
+.ll 70n
+.\}
 .ps 18
 .vs 22
 .sp 2.75i