- add a margin when formatting w/ -Tascii

- some punctuation fixes
- typos and other small stuff

8 files changed, 36 insertions, 45 deletions

diff --git a/bin/ed/USD.doc/10.edadv/ae0 b/bin/ed/USD.doc/10.edadv/ae0
index 8fed9b6e8d0..a59de564dce 100644
--- a/bin/ed/USD.doc/10.edadv/ae0
+++ b/bin/ed/USD.doc/10.edadv/ae0
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae0,v 1.3 2003/07/29 18:36:30 jmc Exp $
+.\"	$OpenBSD: ae0,v 1.4 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -34,6 +34,10 @@
 .\"
 .\"	@(#)ae0	8.1 (Berkeley) 8/14/93
 .\"
+.if n \{\
+.po 5n
+.ll 70n
+.\}
 .nr P1 1
 .EH 'USD:10-%''Advanced Editing on \s-2UNIX\s+2'
 .OH 'Advanced Editing on \s-2UNIX\s+2''USD:10-%'
@@ -56,7 +60,7 @@ facilities
 for preparing and editing text.
 It provides explanations and examples of
 .IP \(bu
-special characters, line addressing and global commands in the editor
+special characters, line addressing, and global commands in the editor
 .UL ed ;
 .IP \(bu
 commands for ``cut and paste'' operations on files
@@ -64,14 +68,14 @@ and parts of files,
 including the
 .UL mv ,
 .UL cp ,
-.UL cat
+.UL cat ,
 and
 .UL rm
 commands,
 and the
 .UL r ,
 .UL w ,
-.UL m
+.UL m ,
 and
 .UL t
 commands of the editor;
@@ -93,6 +97,6 @@ on how to get their jobs done
 more easily.
 .AE
 .\" .CS 16 0 16 0 0 3
-.if n .ls 2
+.\" .if n .ls 2
 .nr PS 9
 .nr VS 11
diff --git a/bin/ed/USD.doc/10.edadv/ae1 b/bin/ed/USD.doc/10.edadv/ae1
index 9d0883b8f13..e1818b6f3d8 100644
--- a/bin/ed/USD.doc/10.edadv/ae1
+++ b/bin/ed/USD.doc/10.edadv/ae1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae1,v 1.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae1,v 1.3 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -48,17 +48,13 @@ typists, secretaries, casual users _
 often use the system less effectively than they might.
 (There is a good argument that new users would better use their time
 learning a display editor, like 
-.ul
-vi,
+.UL vi ,
 or perhaps a version of
-.ul
-emacs,
+.UL emacs ,
 like
-.ul
-jove,
+.UL jove ,
 rather than an editor as ignorant of display terminals as 
-.ul
-ed.)
+.UL ed .)
 .PP
 This document is intended as a sequel to
 .ul
diff --git a/bin/ed/USD.doc/10.edadv/ae2 b/bin/ed/USD.doc/10.edadv/ae2
index b4b6b58f5fe..b0e8a07d95e 100644
--- a/bin/ed/USD.doc/10.edadv/ae2
+++ b/bin/ed/USD.doc/10.edadv/ae2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae2,v 1.3 2003/07/29 18:36:30 jmc Exp $
+.\"	$OpenBSD: ae2,v 1.4 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -95,7 +95,7 @@ such as tabs.
 If you list a line that contains tabs,
 .UL l
 will print each tab as
-.UL \*et.
+.UL \*et .
 This makes it much easier to correct the sort of typing mistake
 that inserts extra spaces adjacent to tabs,
 or inserts a backspace followed by a space.
@@ -297,8 +297,7 @@ s/th\*.is/this/
 .P2
 the job is done.
 The `\*.' matches the mysterious character between the `h' and the `i',
-.ul
-whatever it is.
+.UL "whatever it is" .
 .PP
 Bear in mind that since `\*.' matches any single character,
 the command
diff --git a/bin/ed/USD.doc/10.edadv/ae3 b/bin/ed/USD.doc/10.edadv/ae3
index ca6aed5539e..92ef63970f0 100644
--- a/bin/ed/USD.doc/10.edadv/ae3
+++ b/bin/ed/USD.doc/10.edadv/ae3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae3,v 1.3 2003/07/29 18:36:30 jmc Exp $
+.\"	$OpenBSD: ae3,v 1.4 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -242,7 +242,7 @@ line `$'.
 .PP
 The line-changing commands
 .UL a ,
-.UL c
+.UL c ,
 and
 .UL i
 by default all affect the current line _
@@ -260,7 +260,7 @@ inserts text before the current line.
 and
 .UL i
 behave identically in one respect _
-when you stop appending, changing or inserting,
+when you stop appending, changing, or inserting,
 dot points at the last line entered.
 This is exactly what you want for typing and editing on the fly.
 For example, you can say
@@ -292,7 +292,7 @@ You should experiment to determine what happens if you add
 no
 lines with
 .UL a ,
-.UL c
+.UL c ,
 or
 .UL i .
 .PP
diff --git a/bin/ed/USD.doc/10.edadv/ae4 b/bin/ed/USD.doc/10.edadv/ae4
index 1ef0a4483eb..05d2d3a3c86 100644
--- a/bin/ed/USD.doc/10.edadv/ae4
+++ b/bin/ed/USD.doc/10.edadv/ae4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae4,v 1.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae4,v 1.3 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -198,7 +198,7 @@ s/a/b/
 .PP
 It is also possible to execute 
 .UL a ,
-.UL c
+.UL c ,
 and
 .UL i
 commands under a global command; as with other multi-line constructions,
diff --git a/bin/ed/USD.doc/10.edadv/ae6 b/bin/ed/USD.doc/10.edadv/ae6
index cc49671e0af..0917484682b 100644
--- a/bin/ed/USD.doc/10.edadv/ae6
+++ b/bin/ed/USD.doc/10.edadv/ae6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae6,v 1.3 2003/07/29 18:36:30 jmc Exp $
+.\"	$OpenBSD: ae6,v 1.4 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -60,15 +60,13 @@ the command
 e  newfile
 .P2
 says `I want to edit a new file called
-.ul
-newfile,
+.UL newfile ,
 without leaving the editor.'
 The
 .UL e
 command discards whatever you're currently working on
 and starts over on 
-.ul
-newfile.
+.UL newfile .
 It's exactly the same as if you had quit with the
 .UL q
 command, then re-entered
@@ -89,7 +87,7 @@ ed  file
 remembers the name of the file,
 and any subsequent
 .UL e ,
-.UL r
+.UL r ,
 or
 .UL w
 commands that don't contain a filename
@@ -235,7 +233,7 @@ The point is that the
 .UL w
 command can
 write out a group of lines, instead of the whole file.
-In fact, you can write out a single line if you like;
+In fact, you can write out a single line if you like:
 just give one line number instead of two.
 For example, if you have just typed a horribly complicated line
 and you know that it (or something like it) is going to be needed later,
@@ -412,11 +410,9 @@ Now you can refer to the marked line with the address
 Marks are most useful for moving things around.
 Find the first line of the block to be moved, and mark it
 with
-.ul
-\(fma.
+.UL ka .
 Then find the last line and mark it with
-.ul
-\(fmb.
+.UL kb .
 Now position yourself at the place where the stuff is to go
 and say
 .P1
diff --git a/bin/ed/USD.doc/10.edadv/ae7 b/bin/ed/USD.doc/10.edadv/ae7
index 15566c73df2..8473fb0b881 100644
--- a/bin/ed/USD.doc/10.edadv/ae7
+++ b/bin/ed/USD.doc/10.edadv/ae7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae7,v 1.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae7,v 1.3 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -215,6 +215,5 @@ sed  -f  cmdfile  input-files...
 has further capabilities, including conditional testing
 and branching, which we cannot go into here, but which are
 described in detail in 
-.ul
-Sed \- A Non-interactive Text Editor.
+.UL "Sed \- A Non-interactive Text Editor" .
 
diff --git a/bin/ed/USD.doc/10.edadv/ae9 b/bin/ed/USD.doc/10.edadv/ae9
index 9f0905f2131..226675fe95e 100644
--- a/bin/ed/USD.doc/10.edadv/ae9
+++ b/bin/ed/USD.doc/10.edadv/ae9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ae9,v 1.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae9,v 1.3 2004/04/06 08:19:20 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -43,16 +43,13 @@ for his careful reading and valuable suggestions.
 References
 .IP [1]
 Brian W. Kernighan,
-.ul
-A Tutorial Introduction to the UNIX Text Editor,
+.UL "A Tutorial Introduction to the UNIX Text Editor" ,
 Bell Laboratories internal memorandum.
 .IP [2]
 Brian W. Kernighan,
-.ul
-UNIX For Beginners,
+.UL "UNIX For Beginners" ,
 Bell Laboratories internal memorandum.
 .IP [3]
 Ken L. Thompson and Dennis M. Ritchie,
-.ul
-The UNIX Programmer's Manual.
+.UL "The UNIX Programmer's Manual" .
 Bell Laboratories.