From 5e8b7bced7b1f29153446f8e281c2c4d9552bbcc Mon Sep 17 00:00:00 2001 From: Jason McIntyre Date: Sat, 26 Jul 2003 20:22:14 +0000 Subject: install ed tutorial papers; very minor modifications, but get rid of the ugly 2-column display; ok mickey@ --- bin/ed/Makefile | 7 ++++++- bin/ed/USD.doc/09.edtut/e1 | 3 +-- bin/ed/USD.doc/09.edtut/e2 | 17 +++-------------- bin/ed/USD.doc/09.edtut/e3 | 4 ++-- bin/ed/USD.doc/09.edtut/e7 | 6 +++--- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index f5ec3775427..59ef171bf1e 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1997/09/21 11:35:04 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2003/07/26 20:22:13 jmc Exp $ PROG= ed CFLAGS+=-DBACKWARDS -DDES @@ -7,4 +7,9 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c #LINKS= ${BINDIR}/ed ${BINDIR}/red #MLINKS= ed.1 red.1 +# These just get installed verbatim +.if make(install) +SUBDIR+= USD.doc/09.edtut +.endif + .include diff --git a/bin/ed/USD.doc/09.edtut/e1 b/bin/ed/USD.doc/09.edtut/e1 index 3fa334bb78b..df74a72ec5f 100644 --- a/bin/ed/USD.doc/09.edtut/e1 +++ b/bin/ed/USD.doc/09.edtut/e1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: e1,v 1.2 2003/06/26 16:24:16 mickey Exp $ +.\" $OpenBSD: e1,v 1.3 2003/07/26 20:22:13 jmc Exp $ .\" .\" Copyright (C) Caldera International Inc. 2001-2002. .\" All rights reserved. @@ -36,7 +36,6 @@ .\" .nr PS 9 .nr VS 11 -.if t .2C .SH Introduction .PP diff --git a/bin/ed/USD.doc/09.edtut/e2 b/bin/ed/USD.doc/09.edtut/e2 index 89e7ab77fad..a2e76c2f7b9 100644 --- a/bin/ed/USD.doc/09.edtut/e2 +++ b/bin/ed/USD.doc/09.edtut/e2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: e2,v 1.2 2003/06/26 16:24:16 mickey Exp $ +.\" $OpenBSD: e2,v 1.3 2003/07/26 20:22:13 jmc Exp $ .\" .\" Copyright (C) Caldera International Inc. 2001-2002. .\" All rights reserved. @@ -302,12 +302,12 @@ Experiment with the command \- try reading and printing various files. You may get an error -.UL ?name , +.UL "name: No such file or directory" , where .UL name is the name of a file; this means that the file doesn't exist, -typically because you spelled the file name wrong, +typically because you spelled the file name wrongly, or perhaps that you are not allowed to read or write it. Try alternately reading and appending to see that they work similarly. @@ -380,17 +380,6 @@ This will print .ul all the lines in the buffer (line 1 to last line.) -If you want to stop the printing before it is finished, -push the -.UC DEL -or Delete key; -.ul -ed -will type -.P1 -? -.P2 -and wait for the next command. .PP To print the .ul diff --git a/bin/ed/USD.doc/09.edtut/e3 b/bin/ed/USD.doc/09.edtut/e3 index 886c6da2b7b..65ac801e0fe 100644 --- a/bin/ed/USD.doc/09.edtut/e3 +++ b/bin/ed/USD.doc/09.edtut/e3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: e3,v 1.2 2003/06/26 16:24:16 mickey Exp $ +.\" $OpenBSD: e3,v 1.3 2003/07/26 20:22:13 jmc Exp $ .\" .\" Copyright (C) Caldera International Inc. 2001-2002. .\" All rights reserved. @@ -175,7 +175,7 @@ d .P2 Except that .UL d -deletes lines instead of printing them, +deletes lines instead of printing them; its action is similar to that of .UL p . The lines to be deleted are specified for diff --git a/bin/ed/USD.doc/09.edtut/e7 b/bin/ed/USD.doc/09.edtut/e7 index 6d21a0166dd..0cdd2e819e6 100644 --- a/bin/ed/USD.doc/09.edtut/e7 +++ b/bin/ed/USD.doc/09.edtut/e7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: e7,v 1.2 2003/06/26 16:24:16 mickey Exp $ +.\" $OpenBSD: e7,v 1.3 2003/07/26 20:22:13 jmc Exp $ .\" .\" Copyright (C) Caldera International Inc. 2001-2002. .\" All rights reserved. @@ -76,7 +76,7 @@ as with .UL a . If no lines are specified, replace line dot. -Dot is set to last line changed. +Dot is set to the last line changed. .LP .UL d : Delete the lines specified. @@ -158,7 +158,7 @@ into .UL string2 in the specified lines. If no lines are specified, make the substitution in line dot. -Dot is set to last line in which a +Dot is set to the last line in which a substitution took place, which means that if no substitution took place, dot is not changed. .UL s changes only the first occurrence of -- cgit v1.2.3