install ed advanced tutorial papers;

some minor changes;

ok mickey@

5 files changed, 9 insertions, 66 deletions

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 59ef171bf1e..005d995d265 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2003/07/26 20:22:13 jmc Exp $
+#	$OpenBSD: Makefile,v 1.8 2003/07/29 18:36:30 jmc Exp $
 
 PROG=	ed
 CFLAGS+=-DBACKWARDS -DDES
@@ -9,7 +9,7 @@ SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 
 # These just get installed verbatim
 .if make(install)
-SUBDIR+= USD.doc/09.edtut
+SUBDIR+= USD.doc/09.edtut USD.doc/10.edadv
 .endif
 
 .include <bsd.prog.mk>
diff --git a/bin/ed/USD.doc/10.edadv/ae0 b/bin/ed/USD.doc/10.edadv/ae0
index ae43848053e..8fed9b6e8d0 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.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae0,v 1.3 2003/07/29 18:36:30 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -94,6 +94,5 @@ more easily.
 .AE
 .\" .CS 16 0 16 0 0 3
 .if n .ls 2
-.if t .2C
 .nr PS 9
 .nr VS 11
diff --git a/bin/ed/USD.doc/10.edadv/ae2 b/bin/ed/USD.doc/10.edadv/ae2
index a1f47a8a150..b4b6b58f5fe 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.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae2,v 1.3 2003/07/29 18:36:30 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -91,17 +91,11 @@ which gives slightly more information than
 In particular,
 .UL l
 makes visible characters that are normally invisible,
-such as tabs and backspaces.
-If you list a line that contains some of these,
+such as tabs.
+If you list a line that contains tabs,
 .UL l
 will print each tab as
-.UL \z\(mi>
-and each backspace as
-.UL \z\(mi< .\(dg
-.FS
-\(dg These composite characters are created by overstriking a minus
-and a > or <, so they only appear as < or > on display terminals.
-.FE
+.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.
@@ -719,35 +713,6 @@ The way around this, if it matters, is to specify a pattern like
 .P2
 which says `an x, a space, then as many more spaces as possible, then a y',
 in other words, one or more spaces.
-.PP
-The other startling behavior of `*' is again related to the fact
-that zero is a legitimate number of occurrences of something
-followed by a star. The command
-.P1
-s/x*/y/g
-.P2
-when applied to the line
-.P1
-abcdef
-.P2
-produces
-.P1
-yaybycydyeyfy
-.P2
-which is almost certainly not what was intended.
-The reason for this behavior is that zero is a legal number
-of matches,
-and there are no x's at the beginning of the line
-(so that gets converted into a `y'),
-nor between the `a' and the `b'
-(so that gets converted into a `y'), nor ...
-and so on.
-Make sure you really want zero matches;
-if not, in this case write
-.P1
-s/xx*/y/g
-.P2
-`xx*' is one or more x's.
 .SH
 The Brackets `[ ]'
 .PP
diff --git a/bin/ed/USD.doc/10.edadv/ae3 b/bin/ed/USD.doc/10.edadv/ae3
index 9351e5f0fa8..ca6aed5539e 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.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae3,v 1.3 2003/07/29 18:36:30 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -98,11 +98,6 @@ prints from three lines before where you are now
 (at line dot)
 to three lines after,
 thus giving you a bit of context.
-By the way, the `+' can be omitted:
-.P1
-\&\*.-3,\*.3p
-.P2
-is absolutely identical in meaning.
 .PP
 Another area in which you can save typing effort
 in specifying lines is to use `\-' and `+' as line numbers
@@ -491,14 +486,3 @@ if you are reading or writing a file or making substitutions or deleting lines,
 in some clean but unpredictable state in the middle
 (which is why it is not usually wise to stop them).
 Dot may or may not be changed.
-.PP
-Printing is more clear cut.
-Dot is not changed until the printing is done.
-Thus if you print until you see an interesting line,
-then hit delete, you are
-.ul
-not
-sitting on that line or even near it.
-Dot is left where it was when the
-.UL p
-command was started.
diff --git a/bin/ed/USD.doc/10.edadv/ae6 b/bin/ed/USD.doc/10.edadv/ae6
index c4dcf130495..cc49671e0af 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.2 2003/06/26 16:24:16 mickey Exp $
+.\"	$OpenBSD: ae6,v 1.3 2003/07/29 18:36:30 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -353,11 +353,6 @@ m+
 .P2
 does it.
 It says to move line dot to after one line after line dot.
-If you are positioned on the second line,
-.P1
-m--
-.P2
-does the interchange.
 .PP
 As you can see, the
 .UL m